[SecurityBundle] Allow an array of pattern in firewall configuration

lyrixx · lyrixx · commit e83df406fafd · 2023-07-27T10:32:46.000+02:00
diff --git a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 ---
 
  * Deprecate `Security::ACCESS_DENIED_ERROR`, `AUTHENTICATION_ERROR` and `LAST_USERNAME` constants, use the ones on `SecurityRequestAttributes` instead
+ * Allow an array of `pattern` in firewall configuration
 
 6.3
 ---
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
@@ -191,7 +191,12 @@ private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $facto
         ;
 
         $firewallNodeBuilder
-            ->scalarNode('pattern')->end()
+            ->scalarNode('pattern')
+                ->beforeNormalization()
+                    ->ifTrue(fn ($v) => is_array($v))
+                    ->then(fn ($v) => sprintf('(%s)', implode('|', $v)))
+                ->end()
+            ->end()
             ->scalarNode('host')->end()
             ->arrayNode('methods')
                 ->beforeNormalization()->ifString()->then(function ($v) { return preg_split('/\s*,\s*/', $v); })->end()
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTestCase.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTestCase.php
@@ -716,6 +716,15 @@ public function testFirewallLogoutClearSiteData()
         $this->assertSame(['cookies', 'executionContexts'], $ClearSiteDataConfig);
     }
 
+    public function testFirewallPatterns()
+    {
+        $container = $this->getContainer('firewall_patterns');
+        $chainRequestMatcherId = (string) $container->getDefinition('security.firewall.map')->getArgument(1)->getValues()['security.firewall.map.context.no_security'];
+        $requestMatcherId = (string) $container->getDefinition($chainRequestMatcherId)->getArgument(0)[0];
+
+        $this->assertSame('(^/register$|^/documentation$)', $container->getDefinition($requestMatcherId)->getArgument(0));
+    }
+
     protected function getContainer($file)
     {
         $file .= '.'.$this->getFileExtension();
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/firewall_patterns.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/firewall_patterns.php
@@ -0,0 +1,12 @@
+<?php
+
+$container->loadFromExtension('security', [
+    'firewalls' => [
+        'no_security' => [
+            'pattern' => [
+                '^/register$',
+                '^/documentation$',
+            ],
+        ],
+    ],
+]);
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/firewall_patterns.yml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/firewall_patterns.yml
@@ -0,0 +1,6 @@
+security:
+    firewalls:
+        no_security:
+            pattern:
+                - "^/register$"
+                - "^/documentation$"
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/XmlCompleteConfigurationTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/XmlCompleteConfigurationTest.php
@@ -17,6 +17,11 @@
 
 class XmlCompleteConfigurationTest extends CompleteConfigurationTestCase
 {
+    public function testFirewallPatterns()
+    {
+        $this->markTestSkipped('This features is not supported in XML.');
+    }
+
     protected function getLoader(ContainerBuilder $container)
     {
         return new XmlFileLoader($container, new FileLocator(__DIR__.'/Fixtures/xml'));

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,11 @@`
`17`	`17`
`18`	`18`	`class XmlCompleteConfigurationTest extends CompleteConfigurationTestCase`
`19`	`19`	`{`
	`20`	`+ public function testFirewallPatterns()`
	`21`	`+ {`
	`22`	`+ $this->markTestSkipped('This features is not supported in XML.');`
	`23`	`+ }`
	`24`	`+`
`20`	`25`	`protected function getLoader(ContainerBuilder $container)`
`21`	`26`	`{`
`22`	`27`	`return new XmlFileLoader($container, new FileLocator(__DIR__.'/Fixtures/xml'));`