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

Commit05cd2bc

Browse files
[Security] Don't invalidate the user when the password was not stored in the session
1 parentcad21a9 commit05cd2bc

File tree

5 files changed

+88
-30
lines changed

5 files changed

+88
-30
lines changed

‎src/Symfony/Component/Security/Core/Tests/Authentication/Token/Fixtures/CustomUser.php

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
11
<?php
22

3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
312
namespaceSymfony\Component\Security\Core\Tests\Authentication\Token\Fixtures;
413

514
useSymfony\Component\Security\Core\User\UserInterface;
615

716
finalclass CustomUserimplements UserInterface
817
{
9-
/** @var string */
10-
private$username;
11-
/** @var array */
12-
private$roles;
13-
14-
publicfunction__construct(string$username,array$roles)
15-
{
16-
$this->username =$username;
17-
$this->roles =$roles;
18+
publicfunction__construct(
19+
privatestring$username,
20+
privatearray$roles,
21+
) {
1822
}
1923

2024
publicfunctiongetUserIdentifier():string
@@ -27,16 +31,6 @@ public function getRoles(): array
2731
return$this->roles;
2832
}
2933

30-
publicfunctiongetPassword(): ?string
31-
{
32-
returnnull;
33-
}
34-
35-
publicfunctiongetSalt(): ?string
36-
{
37-
returnnull;
38-
}
39-
4034
publicfunctioneraseCredentials():void
4135
{
4236
}

‎src/Symfony/Component/Security/Http/Firewall/ContextListener.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ public function onKernelResponse(ResponseEvent $event): void
187187
*
188188
* @throws \RuntimeException
189189
*/
190-
protectedfunctionrefreshUser(TokenInterface$token): ?TokenInterface
190+
privatefunctionrefreshUser(TokenInterface$token): ?TokenInterface
191191
{
192192
$user =$token->getUser();
193193

@@ -288,7 +288,10 @@ private static function hasUserChanged(UserInterface $originalUser, TokenInterfa
288288
}
289289

290290
if ($originalUserinstanceof PasswordAuthenticatedUserInterface ||$refreshedUserinstanceof PasswordAuthenticatedUserInterface) {
291-
if (!$originalUserinstanceof PasswordAuthenticatedUserInterface || !$refreshedUserinstanceof PasswordAuthenticatedUserInterface ||$originalUser->getPassword() !==$refreshedUser->getPassword()) {
291+
if (!$originalUserinstanceof PasswordAuthenticatedUserInterface
292+
|| !$refreshedUserinstanceof PasswordAuthenticatedUserInterface
293+
||$refreshedUser->getPassword() !== ($originalUser->getPassword() ??$refreshedUser->getPassword())
294+
) {
292295
returntrue;
293296
}
294297

‎src/Symfony/Component/Security/Http/Tests/Firewall/AccessListenerTest.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,7 @@ public function testHandleWhenTheAccessDecisionManagerDecidesToRefuseAccess()
4242
->willReturn([['foo' =>'bar'],null])
4343
;
4444

45-
$token =newclassextends AbstractToken {
46-
publicfunctiongetCredentials():mixed
47-
{
48-
}
49-
};
45+
$token =newclassextends AbstractToken {};
5046

5147
$tokenStorage =$this->createMock(TokenStorageInterface::class);
5248
$tokenStorage

‎src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
useSymfony\Component\Security\Core\User\UserInterface;
3737
useSymfony\Component\Security\Core\User\UserProviderInterface;
3838
useSymfony\Component\Security\Http\Firewall\ContextListener;
39+
useSymfony\Component\Security\Http\Tests\Fixtures\CustomUser;
3940
useSymfony\Contracts\Service\ServiceLocatorTrait;
4041

4142
class ContextListenerTestextends TestCase
@@ -351,6 +352,25 @@ public function testOnKernelResponseRemoveListener()
351352
$this->assertEmpty($dispatcher->getListeners());
352353
}
353354

355+
publicfunctiontestRemovingPasswordFromSessionDoesntInvalidateTheToken()
356+
{
357+
$user =newCustomUser('user', ['ROLE_USER'],'pass');
358+
359+
$userProvider =$this->createMock(UserProviderInterface::class);
360+
$userProvider->expects($this->once())
361+
->method(('supportsClass'))
362+
->with(CustomUser::class)
363+
->willReturn(true);
364+
$userProvider->expects($this->once())
365+
->method('refreshUser')
366+
->willReturn($user);
367+
368+
$tokenStorage =$this->handleEventWithPreviousSession([$userProvider],$user);
369+
370+
$this->assertInstanceOf(UsernamePasswordToken::class,$tokenStorage->getToken());
371+
$this->assertSame($user,$tokenStorage->getToken()->getUser());
372+
}
373+
354374
protectedfunctionrunSessionOnKernelResponse($newToken,$original =null)
355375
{
356376
$session =newSession(newMockArraySessionStorage());
@@ -543,10 +563,6 @@ public function getRoleNames(): array
543563
return$this->roles;
544564
}
545565

546-
publicfunctiongetCredentials()
547-
{
548-
}
549-
550566
publicfunctiongetUser():UserInterface
551567
{
552568
return$this->user;
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespaceSymfony\Component\Security\Http\Tests\Fixtures;
13+
14+
useSymfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
15+
useSymfony\Component\Security\Core\User\UserInterface;
16+
17+
finalclass CustomUserimplements UserInterface, PasswordAuthenticatedUserInterface
18+
{
19+
publicfunction__construct(
20+
privatestring$username,
21+
privatearray$roles,
22+
private ?string$password =null,
23+
) {
24+
}
25+
26+
publicfunctiongetUserIdentifier():string
27+
{
28+
return$this->username;
29+
}
30+
31+
publicfunctiongetRoles():array
32+
{
33+
return$this->roles;
34+
}
35+
36+
publicfunctiongetPassword(): ?string
37+
{
38+
return$this->password ??null;
39+
}
40+
41+
publicfunctioneraseCredentials():void
42+
{
43+
}
44+
45+
publicfunction__serialize():array
46+
{
47+
return [\sprintf("\0%s\0username",self::class) =>$this->username];
48+
}
49+
}

0 commit comments

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