Skip to content

[Security] Copy token attributes in PreAuthenticated and User AuthenticationProviders #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
1 commit merged into from
Feb 27, 2011
Merged

[Security] Copy token attributes in PreAuthenticated and User AuthenticationProviders #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ...omponent/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

/**
Expand Down
5 changes: 4 additions & 1 deletion src/Symfony/Component/Security/Core/Authentication/Provider/UserAuthenticationProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 3 additions & 0 deletions ...nent/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProviderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}

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

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

return $token;
}

Expand Down
3 changes: 3 additions & 0 deletions .../Tests/Component/Security/Core/Authentication/Provider/UserAuthenticationProviderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -168,6 +169,8 @@ protected function getSupportedToken()
->will($this->returnValue('key'))
;

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

return $mock;
}

Expand Down