[SecurityBundle] Set request stateless when firewall is stateless

alamirault · fabpot · commit ce458c6b59f6 · 2022-12-18T11:02:30.000+01:00
diff --git a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 ---
 
  * Deprecate enabling bundle and not configuring it
+ * Add `_stateless` attribute to the request when firewall is stateless
 
 6.2
 ---
diff --git a/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php b/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php
@@ -72,7 +72,14 @@ private function getFirewallContext(Request $request): ?FirewallContext
             if (null === $requestMatcher || $requestMatcher->matches($request)) {
                 $request->attributes->set('_firewall_context', $contextId);
 
-                return $this->container->get($contextId);
+                /** @var FirewallContext $context */
+                $context = $this->container->get($contextId);
+
+                if ($context->getConfig()?->isStateless()) {
+                    $request->attributes->set('_stateless', true);
+                }
+
+                return $context;
             }
         }
 
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Security/FirewallMapTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Security/FirewallMapTest.php
@@ -54,6 +54,7 @@ public function testGetListenersWithInvalidParameter()
         $this->assertEquals([[], null, null], $firewallMap->getListeners($request));
         $this->assertNull($firewallMap->getFirewallConfig($request));
         $this->assertFalse($request->attributes->has(self::ATTRIBUTE_FIREWALL_CONTEXT));
+        $this->assertFalse($request->attributes->has('_stateless'));
     }
 
     public function testGetListeners()
@@ -62,8 +63,8 @@ public function testGetListeners()
 
         $firewallContext = $this->createMock(FirewallContext::class);
 
-        $firewallConfig = new FirewallConfig('main', 'user_checker');
-        $firewallContext->expects($this->once())->method('getConfig')->willReturn($firewallConfig);
+        $firewallConfig = new FirewallConfig('main', 'user_checker', null, true, true);
+        $firewallContext->expects($this->exactly(2))->method('getConfig')->willReturn($firewallConfig);
 
         $listener = function () {};
         $firewallContext->expects($this->once())->method('getListeners')->willReturn([$listener]);
@@ -88,5 +89,6 @@ public function testGetListeners()
         $this->assertEquals([[$listener], $exceptionListener, $logoutListener], $firewallMap->getListeners($request));
         $this->assertEquals($firewallConfig, $firewallMap->getFirewallConfig($request));
         $this->assertEquals('security.firewall.map.context.foo', $request->attributes->get(self::ATTRIBUTE_FIREWALL_CONTEXT));
+        $this->assertTrue($request->attributes->get('_stateless'));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,14 @@ private function getFirewallContext(Request $request): ?FirewallContext`
`72`	`72`	`if (null === $requestMatcher \|\| $requestMatcher->matches($request)) {`
`73`	`73`	`$request->attributes->set('_firewall_context', $contextId);`
`74`	`74`
`75`		`- return $this->container->get($contextId);`
	`75`	`+ /** @var FirewallContext $context */`
	`76`	`+ $context = $this->container->get($contextId);`
	`77`	`+`
	`78`	`+ if ($context->getConfig()?->isStateless()) {`
	`79`	`+ $request->attributes->set('_stateless', true);`
	`80`	`+ }`
	`81`	`+`
	`82`	`+ return $context;`
`76`	`83`	`}`
`77`	`84`	`}`
`78`	`85`