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

Commitcb19470

Browse files
security #cve-2024-51996 [Security] Check owner of persisted remember-me cookie (jderusse)
This PR was merged into the 5.4 branch.
2 parents439a278 +81354d3 commitcb19470

File tree

2 files changed

+48
-5
lines changed

2 files changed

+48
-5
lines changed

‎src/Symfony/Component/Security/Http/RememberMe/PersistentRememberMeHandler.php‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,16 @@ public function consumeRememberMeCookie(RememberMeDetails $rememberMeDetails): U
6666
thrownewAuthenticationException('The cookie is incorrectly formatted.');
6767
}
6868

69-
[$series,$tokenValue] =explode(':',$rememberMeDetails->getValue());
69+
[$series,$tokenValue] =explode(':',$rememberMeDetails->getValue(),2);
7070
$persistentToken =$this->tokenProvider->loadTokenBySeries($series);
7171

72+
if ($persistentToken->getUserIdentifier() !==$rememberMeDetails->getUserIdentifier() ||$persistentToken->getClass() !==$rememberMeDetails->getUserFqcn()) {
73+
thrownewAuthenticationException('The cookie\'s hash is invalid.');
74+
}
75+
76+
// content of $rememberMeDetails is not trustable. this prevents use of this class
77+
unset($rememberMeDetails);
78+
7279
if ($this->tokenVerifier) {
7380
$isTokenValid =$this->tokenVerifier->verifyToken($persistentToken,$tokenValue);
7481
}else {
@@ -78,11 +85,17 @@ public function consumeRememberMeCookie(RememberMeDetails $rememberMeDetails): U
7885
thrownewCookieTheftException('This token was already used. The account is possibly compromised.');
7986
}
8087

81-
if ($persistentToken->getLastUsed()->getTimestamp() +$this->options['lifetime'] <time()) {
88+
$expires =$persistentToken->getLastUsed()->getTimestamp() +$this->options['lifetime'];
89+
if ($expires <time()) {
8290
thrownewAuthenticationException('The cookie has expired.');
8391
}
8492

85-
returnparent::consumeRememberMeCookie($rememberMeDetails->withValue($persistentToken->getLastUsed()->getTimestamp().':'.$rememberMeDetails->getValue().':'.$persistentToken->getClass()));
93+
returnparent::consumeRememberMeCookie(newRememberMeDetails(
94+
$persistentToken->getClass(),
95+
$persistentToken->getUserIdentifier(),
96+
$expires,
97+
$persistentToken->getLastUsed()->getTimestamp().':'.$series.':'.$tokenValue.':'.$persistentToken->getClass()
98+
));
8699
}
87100

88101
publicfunctionprocessRememberMe(RememberMeDetails$rememberMeDetails,UserInterface$user):void

‎src/Symfony/Component/Security/Http/Tests/RememberMe/PersistentRememberMeHandlerTest.php‎

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public function testConsumeRememberMeCookieValid()
8080
$this->tokenProvider->expects($this->any())
8181
->method('loadTokenBySeries')
8282
->with('series1')
83-
->willReturn(newPersistentToken(InMemoryUser::class,'wouter','series1','tokenvalue',new \DateTime('-10 min')))
83+
->willReturn(newPersistentToken(InMemoryUser::class,'wouter','series1','tokenvalue',$lastUsed =new \DateTime('-10 min')))
8484
;
8585

8686
$this->tokenProvider->expects($this->once())->method('updateToken')->with('series1');
@@ -98,11 +98,41 @@ public function testConsumeRememberMeCookieValid()
9898

9999
$this->assertSame($rememberParts[0],$cookieParts[0]);// class
100100
$this->assertSame($rememberParts[1],$cookieParts[1]);// identifier
101-
$this->assertSame($rememberParts[2],$cookieParts[2]);// expire
101+
$this->assertEqualsWithDelta($lastUsed->getTimestamp() +31536000, (int)$cookieParts[2],2);// expire
102102
$this->assertNotSame($rememberParts[3],$cookieParts[3]);// value
103103
$this->assertSame(explode(':',$rememberParts[3])[0],explode(':',$cookieParts[3])[0]);// series
104104
}
105105

106+
publicfunctiontestConsumeRememberMeCookieInvalidOwner()
107+
{
108+
$this->tokenProvider->expects($this->any())
109+
->method('loadTokenBySeries')
110+
->with('series1')
111+
->willReturn(newPersistentToken(InMemoryUser::class,'wouter','series1','tokenvalue',new \DateTime('-10 min')))
112+
;
113+
114+
$rememberMeDetails =newRememberMeDetails(InMemoryUser::class,'jeremy',360,'series1:tokenvalue');
115+
116+
$this->expectException(AuthenticationException::class);
117+
$this->expectExceptionMessage('The cookie\'s hash is invalid.');
118+
$this->handler->consumeRememberMeCookie($rememberMeDetails);
119+
}
120+
121+
publicfunctiontestConsumeRememberMeCookieInvalidValue()
122+
{
123+
$this->tokenProvider->expects($this->any())
124+
->method('loadTokenBySeries')
125+
->with('series1')
126+
->willReturn(newPersistentToken(InMemoryUser::class,'wouter','series1','tokenvalue',new \DateTime('-10 min')))
127+
;
128+
129+
$rememberMeDetails =newRememberMeDetails(InMemoryUser::class,'wouter',360,'series1:tokenvalue:somethingelse');
130+
131+
$this->expectException(AuthenticationException::class);
132+
$this->expectExceptionMessage('This token was already used. The account is possibly compromised.');
133+
$this->handler->consumeRememberMeCookie($rememberMeDetails);
134+
}
135+
106136
publicfunctiontestConsumeRememberMeCookieValidByValidatorWithoutUpdate()
107137
{
108138
$verifier =$this->createMock(TokenVerifierInterface::class);

0 commit comments

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