[Security] Copy token attributes when auth providers create a new tok…

…en from another PreAuthenticatedAuthenticationProvider and UserAuthenticationProvider tend to copy a token instead of modifying it during their authenticate() methods, which is probably a good idea if the token might be immutable. Ensure that the token's attributes get copied along with everything else.
symfony · Feb 27, 2011 · Feb 23, 2011 · Feb 26, 2011 · Feb 26, 2011 · Feb 23, 2011
commit 5113886f34b4d6224a28ebefb5e71515e291d1a9
diff --git a/...omponent/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php b/...omponent/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
@@ -68,7 +68,10 @@ public function authenticate(TokenInterface $token)

        $this->accountChecker->checkPostAuth($user);

-        return new PreAuthenticatedToken($user, $token->getCredentials(), $this->providerKey, $user->getRoles());
+        $authenticatedToken = new PreAuthenticatedToken($user, $token->getCredentials(), $this->providerKey, $user->getRoles());
+        $authenticatedToken->setAttributes($token->getAttributes());
+
+        return $authenticatedToken;
    }

    /**

diff --git a/src/Symfony/Component/Security/Core/Authentication/Provider/UserAuthenticationProvider.php b/src/Symfony/Component/Security/Core/Authentication/Provider/UserAuthenticationProvider.php
@@ -70,7 +70,10 @@ public function authenticate(TokenInterface $token)
            $this->checkAuthentication($user, $token);
            $this->accountChecker->checkPostAuth($user);

-            return new UsernamePasswordToken($user, $token->getCredentials(), $this->providerKey, $user->getRoles());
+            $authenticatedToken = new UsernamePasswordToken($user, $token->getCredentials(), $this->providerKey, $user->getRoles());
+            $authenticatedToken->setAttributes($token->getAttributes());
+
+            return $authenticatedToken;
        } catch (UsernameNotFoundException $notFound) {
            if ($this->hideUserNotFoundExceptions) {
                throw new BadCredentialsException('Bad credentials', 0, $notFound);

diff --git a/...nent/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProviderTest.php b/...nent/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProviderTest.php
@@ -60,6 +60,7 @@ public function testAuthenticate()
        $this->assertEquals('pass', $token->getCredentials());
        $this->assertEquals('key', $token->getProviderKey());
        $this->assertEquals(array(), $token->getRoles());
+        $this->assertEquals(array('foo' => 'bar'), $token->getAttributes(), '->authenticate() copies token attributes');
        $this->assertSame($user, $token->getUser());
    }

@@ -103,6 +104,8 @@ protected function getSupportedToken($user = false, $credentials = false)
            ->will($this->returnValue('key'))
        ;

+        $token->setAttributes(array('foo' => 'bar'));
+
        return $token;
    }


diff --git a/.../Tests/Component/Security/Core/Authentication/Provider/UserAuthenticationProviderTest.php b/.../Tests/Component/Security/Core/Authentication/Provider/UserAuthenticationProviderTest.php
@@ -157,6 +157,7 @@ public function testAuthenticate()
        $this->assertSame($user, $authToken->getUser());
        $this->assertEquals(array(new Role('ROLE_FOO')), $authToken->getRoles());
        $this->assertEquals('foo', $authToken->getCredentials());
+        $this->assertEquals(array('foo' => 'bar'), $authToken->getAttributes(), '->authenticate() copies token attributes');
    }

    protected function getSupportedToken()
@@ -168,6 +169,8 @@ protected function getSupportedToken()
            ->will($this->returnValue('key'))
        ;

+        $mock->setAttributes(array('foo' => 'bar'));
+
        return $mock;
    }