[SecurityBundle] Revert adding _stateless attribute to the request when firewall is stateless and the attribute is not already set

MatTheCat · MatTheCat · commit ad9faa2d6aca · 2024-08-15T18:23:25.000+02:00
diff --git a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 ---
 
  * Allow configuring the secret used to sign login links
+ * Revert adding `_stateless` attribute to the request when firewall is stateless and the attribute is not already set
 
 7.1
 ---
diff --git a/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php b/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php
@@ -63,14 +63,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
@@ -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];
     }

Original file line number	Diff line number	Diff line change
`@@ -63,14 +63,7 @@ private function getFirewallContext(Request $request): ?FirewallContext`
`63`	`63`	`if (null === $requestMatcher \|\| $requestMatcher->matches($request)) {`
`64`	`64`	`$request->attributes->set('_firewall_context', $contextId);`
`65`	`65`
`66`		`- /** @var FirewallContext $context */`
`67`		`- $context = $this->container->get($contextId);`
`68`		`-`
`69`		`- if ($context->getConfig()?->isStateless() && !$request->attributes->has('_stateless')) {`
`70`		`- $request->attributes->set('_stateless', true);`
`71`		`- }`
`72`		`-`
`73`		`- return $context;`
	`66`	`+ return $this->container->get($contextId);`
`74`	`67`	`}`
`75`	`68`	`}`
`76`	`69`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public function testGetListeners(Request $request, bool $expectedState)`
`63`	`63`	`$firewallContext = $this->createMock(FirewallContext::class);`
`64`	`64`
`65`	`65`	`$firewallConfig = new FirewallConfig('main', 'user_checker', null, true, true);`
`66`		`- $firewallContext->expects($this->exactly(2))->method('getConfig')->willReturn($firewallConfig);`
	`66`	`+ $firewallContext->expects($this->once())->method('getConfig')->willReturn($firewallConfig);`
`67`	`67`
`68`	`68`	`$listener = function () {};`
`69`	`69`	`$firewallContext->expects($this->once())->method('getListeners')->willReturn([$listener]);`
`@@ -93,7 +93,7 @@ public function testGetListeners(Request $request, bool $expectedState)`
`93`	`93`
`94`	`94`	`public static function providesStatefulStatelessRequests(): \Generator`
`95`	`95`	`{`
`96`		`- yield [new Request(), true];`
	`96`	`+ yield [new Request(), false];`
`97`	`97`	`yield [new Request(attributes: ['_stateless' => false]), false];`
`98`	`98`	`yield [new Request(attributes: ['_stateless' => true]), true];`
`99`	`99`	`}`