Move cache of the firewall context into the request parameters

GromNaN · GromNaN · commit 9aa00ced9176 · 2017-05-29T19:01:45.000+02:00
diff --git a/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php b/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php
@@ -26,13 +26,11 @@ class FirewallMap implements FirewallMapInterface
 {
     private $container;
     private $map;
-    private $contexts;
 
     public function __construct(ContainerInterface $container, $map)
     {
         $this->container = $container;
         $this->map = $map;
-        $this->contexts = new \SplObjectStorage();
     }
 
     public function getListeners(Request $request)
@@ -60,15 +58,22 @@ public function getFirewallConfig(Request $request)
         return $context->getConfig();
     }
 
+    /**
+     * @param Request $request
+     *
+     * @return \Symfony\Bundle\SecurityBundle\Security\FirewallContext
+     */
     private function getFirewallContext(Request $request)
     {
-        if ($this->contexts->contains($request)) {
-            return $this->contexts[$request];
+        if ($request->attributes->has('_firewall_context')) {
+            return $this->container->get($request->attributes->get('_firewall_context'));
         }
 
         foreach ($this->map as $contextId => $requestMatcher) {
             if (null === $requestMatcher || $requestMatcher->matches($request)) {
-                return $this->contexts[$request] = $this->container->get($contextId);
+                $request->attributes->set('_firewall_context', $contextId);
+
+                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
@@ -0,0 +1,61 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\SecurityBundle\Tests\Security;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\SecurityBundle\Security\FirewallContext;
+use Symfony\Bundle\SecurityBundle\Security\FirewallMap;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestMatcherInterface;
+
+class FirewallMapTest extends TestCase
+{
+    public function testGetListenersWithEmptyMap()
+    {
+        $request = new Request();
+
+        $map = array();
+        $container = $this->getMockBuilder(Container::class)->getMock();
+        $container->expects($this->never())->method('get');
+
+        $firewallMap = new FirewallMap($container, $map);
+
+        $this->assertEquals(array(array(), null), $firewallMap->getListeners($request));
+
+        $this->assertNull($firewallMap->getFirewallConfig($request));
+    }
+
+    public function testGetListeners()
+    {
+        $request = new Request();
+
+        $firewallContext = $this->getMockBuilder(FirewallContext::class)->disableOriginalConstructor()->getMock();
+        $firewallContext->expects($this->once())->method('getConfig')->willReturn('CONFIG');
+        $firewallContext->expects($this->once())->method('getListeners')->willReturn('LISTENERS');
+        $firewallContext->expects($this->once())->method('getExceptionListener')->willReturn('EXCEPTION LISTENER');
+
+        $matcher = $this->getMockBuilder(RequestMatcherInterface::class)->getMock();
+        $matcher->expects($this->once())
+            ->method('matches')
+            ->with($request)
+            ->willReturn(true);
+
+        $container = $this->getMockBuilder(Container::class)->getMock();
+        $container->expects($this->exactly(2))->method('get')->willReturn($firewallContext);
+
+        $firewallMap = new FirewallMap($container, array('security.firewall.map.context.foo' => $matcher));
+
+        $this->assertEquals(array('LISTENERS', 'EXCEPTION LISTENER'), $firewallMap->getListeners($request));
+        $this->assertEquals('CONFIG', $firewallMap->getFirewallConfig($request));
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -26,13 +26,11 @@ class FirewallMap implements FirewallMapInterface`
`26`	`26`	`{`
`27`	`27`	`private $container;`
`28`	`28`	`private $map;`
`29`		`- private $contexts;`
`30`	`29`
`31`	`30`	`public function __construct(ContainerInterface $container, $map)`
`32`	`31`	`{`
`33`	`32`	`$this->container = $container;`
`34`	`33`	`$this->map = $map;`
`35`		`- $this->contexts = new \SplObjectStorage();`
`36`	`34`	`}`
`37`	`35`
`38`	`36`	`public function getListeners(Request $request)`
`@@ -60,15 +58,22 @@ public function getFirewallConfig(Request $request)`
`60`	`58`	`return $context->getConfig();`
`61`	`59`	`}`
`62`	`60`
	`61`	`+ /**`
	`62`	`+ * @param Request $request`
	`63`	`+ *`
	`64`	`+ * @return \Symfony\Bundle\SecurityBundle\Security\FirewallContext`
	`65`	`+ */`
`63`	`66`	`private function getFirewallContext(Request $request)`
`64`	`67`	`{`
`65`		`- if ($this->contexts->contains($request)) {`
`66`		`- return $this->contexts[$request];`
	`68`	`+ if ($request->attributes->has('_firewall_context')) {`
	`69`	`+ return $this->container->get($request->attributes->get('_firewall_context'));`
`67`	`70`	`}`
`68`	`71`
`69`	`72`	`foreach ($this->map as $contextId => $requestMatcher) {`
`70`	`73`	`if (null === $requestMatcher \|\| $requestMatcher->matches($request)) {`
`71`		`- return $this->contexts[$request] = $this->container->get($contextId);`
	`74`	`+ $request->attributes->set('_firewall_context', $contextId);`
	`75`	`+`
	`76`	`+ return $this->container->get($contextId);`
`72`	`77`	`}`
`73`	`78`	`}`
`74`	`79`	`}`