Make it possible to match the request based on HTTP methods in the firewall configuration

Daniel Tschinder · Daniel Tschinder · commit 2878757cc0b4 · 2014-03-07T15:03:15.000+01:00
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
@@ -201,6 +201,10 @@ private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $facto
         $firewallNodeBuilder
             ->scalarNode('pattern')->end()
             ->scalarNode('host')->end()
+            ->arrayNode('methods')
+                ->beforeNormalization()->ifString()->then(function ($v) { return preg_split('/\s*,\s*/', $v); })->end()
+                ->prototype('scalar')->end()
+            ->end()
             ->booleanNode('security')->defaultTrue()->end()
             ->scalarNode('request_matcher')->end()
             ->scalarNode('access_denied_url')->end()
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -254,7 +254,8 @@ private function createFirewall(ContainerBuilder $container, $id, $firewall, &$a
         } elseif (isset($firewall['pattern']) || isset($firewall['host'])) {
             $pattern = isset($firewall['pattern']) ? $firewall['pattern'] : null;
             $host = isset($firewall['host']) ? $firewall['host'] : null;
-            $matcher = $this->createRequestMatcher($container, $pattern, $host);
+            $methods = isset($firewall['methods']) ? $firewall['methods'] : array();
+            $matcher = $this->createRequestMatcher($container, $pattern, $host, $methods);
         }
 
         // Security disabled?
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
@@ -117,6 +117,7 @@ public function testFirewallRequestMatchers()
             array(
                 '/test',
                 'foo\\.example\\.org',
+                array('GET', 'POST'),
             ),
         ), $matchers);
     }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1.php
@@ -74,6 +74,7 @@
         'host' => array(
             'pattern' => '/test',
             'host' => 'foo\\.example\\.org',
+            'methods' => array('GET', 'POST'),
             'anonymous' => true,
             'http_basic' => true,
         ),
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml
@@ -57,7 +57,7 @@
             <logout />
         </firewall>
 
-        <firewall name="host" pattern="/test" host="foo\.example\.org">
+        <firewall name="host" pattern="/test" host="foo\.example\.org" methods="GET,POST">
             <anonymous />
             <http-basic />
         </firewall>
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1.yml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1.yml
@@ -56,6 +56,7 @@ security:
         host:
             pattern: /test
             host: foo\.example\.org
+            methods: [GET,POST]
             anonymous: true
             http_basic: true
 

Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,8 @@ private function createFirewall(ContainerBuilder $container, $id, $firewall, &$a`
`254`	`254`	`} elseif (isset($firewall['pattern']) \|\| isset($firewall['host'])) {`
`255`	`255`	`$pattern = isset($firewall['pattern']) ? $firewall['pattern'] : null;`
`256`	`256`	`$host = isset($firewall['host']) ? $firewall['host'] : null;`
`257`		`- $matcher = $this->createRequestMatcher($container, $pattern, $host);`
	`257`	`+ $methods = isset($firewall['methods']) ? $firewall['methods'] : array();`
	`258`	`+ $matcher = $this->createRequestMatcher($container, $pattern, $host, $methods);`
`258`	`259`	`}`
`259`	`260`
`260`	`261`	`// Security disabled?`
Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,7 @@ public function testFirewallRequestMatchers()`
`117`	`117`	`array(`
`118`	`118`	`'/test',`
`119`	`119`	`'foo\\.example\\.org',`
	`120`	`+ array('GET', 'POST'),`
`120`	`121`	`),`
`121`	`122`	`), $matchers);`
`122`	`123`	`}`