Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf40ce0f

Browse files
committed
[Security] Load the user before pre/post auth checks when needed
1 parent34bb83d commitf40ce0f

File tree

2 files changed

+84
-0
lines changed

2 files changed

+84
-0
lines changed

‎src/Symfony/Component/Security/Core/Authentication/Provider/SimpleAuthenticationProvider.php‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,11 @@
1111

1212
namespaceSymfony\Component\Security\Core\Authentication\Provider;
1313

14+
useSymfony\Component\Security\Core\Exception\AuthenticationServiceException;
15+
useSymfony\Component\Security\Core\Exception\UsernameNotFoundException;
1416
useSymfony\Component\Security\Core\User\UserChecker;
1517
useSymfony\Component\Security\Core\User\UserCheckerInterface;
18+
useSymfony\Component\Security\Core\User\UserInterface;
1619
useSymfony\Component\Security\Core\User\UserProviderInterface;
1720
useSymfony\Component\Security\Core\Authentication\Token\TokenInterface;
1821
useSymfony\Component\Security\Core\Authentication\SimpleAuthenticatorInterface;
@@ -45,6 +48,30 @@ public function authenticate(TokenInterface $token)
4548
}
4649

4750
$user =$authToken->getUser();
51+
52+
if (!$userinstanceof UserInterface) {
53+
try {
54+
$user =$this->userProvider->loadUserByUsername($user);
55+
56+
if (!$userinstanceof UserInterface) {
57+
thrownewAuthenticationServiceException('The user provider must return a UserInterface object.');
58+
}
59+
60+
return$user;
61+
}catch (UsernameNotFoundException$e) {
62+
$e->setUsername($user);
63+
throw$e;
64+
}catch (\Exception$e) {
65+
$e =newAuthenticationServiceException($e->getMessage(),0,$e);
66+
$e->setToken($token);
67+
throw$e;
68+
}
69+
}
70+
71+
if (!$userinstanceof UserInterface) {
72+
$user =$this->userProvider->loadUserByUsername($user);
73+
}
74+
4875
$this->userChecker->checkPreAuth($user);
4976
$this->userChecker->checkPostAuth($user);
5077

‎src/Symfony/Component/Security/Core/Tests/Authentication/Provider/SimpleAuthenticationProviderTest.php‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,63 @@ public function testAuthenticateWhenPostChecksFails()
7272
$provider->authenticate($token);
7373
}
7474

75+
/**
76+
* @expectedException \Symfony\Component\Security\Core\Exception\LockedException
77+
*/
78+
publicfunctiontestAuthenticateFromString()
79+
{
80+
$user =$this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
81+
82+
$token =$this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
83+
$token->expects($this->any())
84+
->method('getUser')
85+
->will($this->returnValue('foo'));
86+
87+
$userChecker =$this->getMockBuilder('Symfony\Component\Security\Core\User\UserCheckerInterface')->getMock();
88+
$userChecker->expects($this->once())
89+
->method('checkPostAuth')
90+
->will($this->throwException(newLockedException()));
91+
92+
$authenticator =$this->getMockBuilder('Symfony\Component\Security\Core\Authentication\SimpleAuthenticatorInterface')->getMock();
93+
$authenticator->expects($this->once())
94+
->method('authenticateToken')
95+
->will($this->returnValue($token));
96+
97+
$userProvider =$this->getMockBuilder('Symfony\Component\Security\Core\User\UserProviderInterface')->getMock();
98+
$userProvider->expects($this->once())
99+
->method('loadUserByUsername')
100+
->willReturn($this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock());
101+
$provider =$this->getProvider($authenticator,$userProvider,$userChecker);
102+
103+
$this->assertSame($token,$provider->authenticate($token));
104+
}
105+
106+
/**
107+
* @expectedException \Symfony\Component\Security\Core\Exception\UsernameNotFoundException
108+
*/
109+
publicfunctiontestUsernameNotFound()
110+
{
111+
$user =$this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
112+
113+
$token =$this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
114+
$token->expects($this->any())
115+
->method('getUser')
116+
->will($this->returnValue('foo'));
117+
118+
$authenticator =$this->getMockBuilder('Symfony\Component\Security\Core\Authentication\SimpleAuthenticatorInterface')->getMock();
119+
$authenticator->expects($this->once())
120+
->method('authenticateToken')
121+
->will($this->returnValue($token));
122+
123+
$userProvider =$this->getMockBuilder('Symfony\Component\Security\Core\User\UserProviderInterface')->getMock();
124+
$userProvider->expects($this->once())
125+
->method('loadUserByUsername')
126+
->willReturn(null);
127+
$provider =$this->getProvider($authenticator,$userProvider);
128+
129+
$this->assertSame($token,$provider->authenticate($token));
130+
}
131+
75132
protectedfunctiongetProvider($simpleAuthenticator =null,$userProvider =null,$userChecker =null,$key ='test')
76133
{
77134
if (null ===$userChecker) {

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp