Revert "bug #35944 [Security/Core] Fix wrong roles comparison (thlbaut)"

wouterj · wouterj · commit d4e357b1c8f9 · 2020-05-30T11:28:56.000+02:00
This reverts commit 2e46c63, reversing changes made to 47180fe.
diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php
@@ -317,10 +317,13 @@ private function hasUserChanged(UserInterface $user): bool
             return true;
         }
 
-        $currentUserRoles = array_map('strval', (array) $this->user->getRoles());
         $userRoles = array_map('strval', (array) $user->getRoles());
 
-        if (\count($userRoles) !== \count($currentUserRoles) || \count($userRoles) !== \count(array_intersect($userRoles, $currentUserRoles))) {
+        if ($this instanceof SwitchUserToken) {
+            $userRoles[] = 'ROLE_PREVIOUS_ADMIN';
+        }
+
+        if (\count($userRoles) !== \count($this->getRoleNames()) || \count($userRoles) !== \count(array_intersect($userRoles, $this->getRoleNames()))) {
             return true;
         }
 
diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/Token/AbstractTokenTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/Token/AbstractTokenTest.php
@@ -238,7 +238,7 @@ public function getUserChangesAdvancedUser()
      */
     public function testSetUserDoesNotSetAuthenticatedToFalseWhenUserDoesNotChange($user)
     {
-        $token = new ConcreteToken(['ROLE_FOO']);
+        $token = new ConcreteToken();
         $token->setAuthenticated(true);
         $this->assertTrue($token->isAuthenticated());
 

Original file line number	Diff line number	Diff line change
`@@ -317,10 +317,13 @@ private function hasUserChanged(UserInterface $user): bool`
`317`	`317`	`return true;`
`318`	`318`	`}`
`319`	`319`
`320`		`- $currentUserRoles = array_map('strval', (array) $this->user->getRoles());`
`321`	`320`	`$userRoles = array_map('strval', (array) $user->getRoles());`
`322`	`321`
`323`		`- if (\count($userRoles) !== \count($currentUserRoles) \|\| \count($userRoles) !== \count(array_intersect($userRoles, $currentUserRoles))) {`
	`322`	`+ if ($this instanceof SwitchUserToken) {`
	`323`	`+ $userRoles[] = 'ROLE_PREVIOUS_ADMIN';`
	`324`	`+ }`
	`325`	`+`
	`326`	`+ if (\count($userRoles) !== \count($this->getRoleNames()) \|\| \count($userRoles) !== \count(array_intersect($userRoles, $this->getRoleNames()))) {`
`324`	`327`	`return true;`
`325`	`328`	`}`
`326`	`329`
Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ public function getUserChangesAdvancedUser()`
`238`	`238`	`*/`
`239`	`239`	`public function testSetUserDoesNotSetAuthenticatedToFalseWhenUserDoesNotChange($user)`
`240`	`240`	`{`
`241`		`- $token = new ConcreteToken(['ROLE_FOO']);`
	`241`	`+ $token = new ConcreteToken();`
`242`	`242`	`$token->setAuthenticated(true);`
`243`	`243`	`$this->assertTrue($token->isAuthenticated());`
`244`	`244`