Validate that _firewall_context attribute is in the map keys

GromNaN · GromNaN · commit f335537e96eb · 2017-06-09T13:57:46.000+02:00
diff --git a/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php b/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php
@@ -12,6 +12,7 @@
 namespace Symfony\Bundle\SecurityBundle\Security;
 
 use Psr\Container\ContainerInterface;
+use Symfony\Bundle\SecurityBundle\Security\FirewallContext
 use Symfony\Component\Security\Http\FirewallMapInterface;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -140,14 +141,19 @@ public function getFirewallConfig(Request $request)
     }
 
     /**
-     * @param Request $request
-     *
-     * @return \Symfony\Bundle\SecurityBundle\Security\FirewallContext
+     * @return FirewallContext
      */
     private function getFirewallContext(Request $request)
     {
         if ($request->attributes->has('_firewall_context')) {
-            return $this->container->get($request->attributes->get('_firewall_context'));
+            $storedContextId = $request->attributes->get('_firewall_context');
+            foreach ($this->map as $contextId => $requestMatcher) {
+                if ($contextId === $storedContextId) {
+                    return $this->container->get($contextId);
+                }
+            }
+
+            $request->attributes->remove('_firewall_context');
         }
 
         foreach ($this->map as $contextId => $requestMatcher) {
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Security/FirewallMapTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Security/FirewallMapTest.php
@@ -20,6 +20,8 @@
 
 class FirewallMapTest extends TestCase
 {
+    const ATTRIBUTE_FIREWALL_CONTEXT = '_firewall_context';
+
     public function testGetListenersWithEmptyMap()
     {
         $request = new Request();
@@ -31,8 +33,24 @@ public function testGetListenersWithEmptyMap()
         $firewallMap = new FirewallMap($container, $map);
 
         $this->assertEquals(array(array(), null), $firewallMap->getListeners($request));
+        $this->assertNull($firewallMap->getFirewallConfig($request));
+        $this->assertFalse($request->attributes->has(self::ATTRIBUTE_FIREWALL_CONTEXT));
+    }
 
+    public function testGetListenersWithInvalidParameter()
+    {
+        $request = new Request();
+        $request->attributes->set(self::ATTRIBUTE_FIREWALL_CONTEXT, 'foo');
+
+        $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));
+        $this->assertFalse($request->attributes->has(self::ATTRIBUTE_FIREWALL_CONTEXT));
     }
 
     public function testGetListeners()
@@ -57,5 +75,6 @@ public function testGetListeners()
 
         $this->assertEquals(array('LISTENERS', 'EXCEPTION LISTENER'), $firewallMap->getListeners($request));
         $this->assertEquals('CONFIG', $firewallMap->getFirewallConfig($request));
+        $this->assertEquals('security.firewall.map.context.foo', $request->attributes->get(self::ATTRIBUTE_FIREWALL_CONTEXT));
     }
 }
