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

Appearance settings

Commit cb229e5

Browse filesBrowse files
committed
Merge branch '6.4' into 7.2
* 6.4: Improve readability of disallow_search_engine_index condition [Security] Avoid failing when PersistentRememberMeHandler handles a malformed cookie [DoctrineBridge] Undefined variable
2 parents d0ce2d6 + a1228e4 commit cb229e5
Copy full SHA for cb229e5

File tree

Expand file treeCollapse file tree

4 files changed

+24
-3
lines changed
Filter options
Expand file treeCollapse file tree

4 files changed

+24
-3
lines changed

‎src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineFooType.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineFooType.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?str
4141
throw new ConversionException(sprintf('Expected "%s", got "%s"', 'Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\Foo', get_debug_type($value)));
4242
}
4343

44-
return $foo->bar;
44+
return $value->bar;
4545
}
4646

4747
public function convertToPHPValue($value, AbstractPlatform $platform): ?Foo

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,7 @@ static function (ChildDefinition $definition, AsPeriodicTask|AsCronTask $attribu
731731
$container->getDefinition('config_cache_factory')->setArguments([]);
732732
}
733733

734-
if (!$config['disallow_search_engine_index'] ?? false) {
734+
if (!$config['disallow_search_engine_index']) {
735735
$container->removeDefinition('disallow_search_engine_index_response_listener');
736736
}
737737

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Http/RememberMe/PersistentRememberMeHandler.php
+6-1Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,12 @@ public function clearRememberMeCookie(): void
124124
return;
125125
}
126126

127-
$rememberMeDetails = RememberMeDetails::fromRawCookie($cookie);
127+
try {
128+
$rememberMeDetails = RememberMeDetails::fromRawCookie($cookie);
129+
} catch (AuthenticationException) {
130+
// malformed cookie should not fail the response and can be simply ignored
131+
return;
132+
}
128133
[$series] = explode(':', $rememberMeDetails->getValue());
129134
$this->tokenProvider->deleteTokenBySeries($series);
130135
}

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Http/Tests/RememberMe/PersistentRememberMeHandlerTest.php
+16Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,22 @@ public function testClearRememberMeCookie()
7474
$this->assertNull($cookie->getValue());
7575
}
7676

77+
public function testClearRememberMeCookieMalformedCookie()
78+
{
79+
$this->tokenProvider->expects($this->exactly(0))
80+
->method('deleteTokenBySeries');
81+
82+
$this->request->cookies->set('REMEMBERME', 'malformed');
83+
84+
$this->handler->clearRememberMeCookie();
85+
86+
$this->assertTrue($this->request->attributes->has(ResponseListener::COOKIE_ATTR_NAME));
87+
88+
/** @var Cookie $cookie */
89+
$cookie = $this->request->attributes->get(ResponseListener::COOKIE_ATTR_NAME);
90+
$this->assertNull($cookie->getValue());
91+
}
92+
7793
public function testConsumeRememberMeCookieValid()
7894
{
7995
$this->tokenProvider->expects($this->any())

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.