From 47baed9960149adea9c74dc87392e68e32535439 Mon Sep 17 00:00:00 2001 From: matlec Date: Fri, 16 Aug 2024 11:13:14 +0200 Subject: [PATCH] [SecurityBundle] Revert adding `_stateless` attribute to the request when firewall is stateless and the attribute is not already set --- .../Bundle/SecurityBundle/Security/FirewallMap.php | 9 +-------- .../SecurityBundle/Tests/Security/FirewallMapTest.php | 4 ++-- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php b/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php index 6f1bdfcdd4892..21e5b8aa68279 100644 --- a/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php +++ b/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php @@ -72,14 +72,7 @@ private function getFirewallContext(Request $request): ?FirewallContext if (null === $requestMatcher || $requestMatcher->matches($request)) { $request->attributes->set('_firewall_context', $contextId); - /** @var FirewallContext $context */ - $context = $this->container->get($contextId); - - if ($context->getConfig()?->isStateless() && !$request->attributes->has('_stateless')) { - $request->attributes->set('_stateless', true); - } - - return $context; + return $this->container->get($contextId); } } diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Security/FirewallMapTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Security/FirewallMapTest.php index fdf9c3d53a3c7..81c85ad76c204 100644 --- a/src/Symfony/Bundle/SecurityBundle/Tests/Security/FirewallMapTest.php +++ b/src/Symfony/Bundle/SecurityBundle/Tests/Security/FirewallMapTest.php @@ -63,7 +63,7 @@ public function testGetListeners(Request $request, bool $expectedState) $firewallContext = $this->createMock(FirewallContext::class); $firewallConfig = new FirewallConfig('main', 'user_checker', null, true, true); - $firewallContext->expects($this->exactly(2))->method('getConfig')->willReturn($firewallConfig); + $firewallContext->expects($this->once())->method('getConfig')->willReturn($firewallConfig); $listener = function () {}; $firewallContext->expects($this->once())->method('getListeners')->willReturn([$listener]); @@ -93,7 +93,7 @@ public function testGetListeners(Request $request, bool $expectedState) public static function providesStatefulStatelessRequests(): \Generator { - yield [new Request(), true]; + yield [new Request(), false]; yield [new Request(attributes: ['_stateless' => false]), false]; yield [new Request(attributes: ['_stateless' => true]), true]; }