Security access control rule field "ips" did not split comma-separated IP addresses into an array

emiel-silverstreet · emiel-silverstreet · commit 7b14d79927a4 · 2018-03-16T13:09:35.000+01:00
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
@@ -166,7 +166,7 @@ private function addAccessControlSection(ArrayNodeDefinition $rootNode)
                             ->end()
                             ->scalarNode('host')->defaultNull()->end()
                             ->arrayNode('ips')
-                                ->beforeNormalization()->ifString()->then(function ($v) { return array($v); })->end()
+                                ->beforeNormalization()->ifString()->then(function ($v) { return preg_split('/\s*,\s*/', $v); })->end()
                                 ->prototype('scalar')->end()
                             ->end()
                             ->arrayNode('methods')
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/MainConfigurationTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/MainConfigurationTest.php
@@ -111,4 +111,24 @@ public function testCsrfOriginalAndAliasValueCausesException()
         $configuration = new MainConfiguration(array(), array());
         $processedConfig = $processor->processConfiguration($configuration, array($config));
     }
+
+    public function testMultipleIps()
+    {
+        $config = array(
+            'access_control' => array(
+                array(
+                    'path' => '^/internal',
+                    'role' => 'IS_AUTHENTICATED_ANONYMOUSLY',
+                    'ips' => '127.0.0.1, ::1',
+                ),
+            ),
+        );
+        $config = array_merge(static::$minimalConfig, $config);
+
+        $processor = new Processor();
+        $configuration = new MainConfiguration(array(), array());
+        $processedConfig = $processor->processConfiguration($configuration, array($config));
+
+        $this->assertSame(array('127.0.0.1', '::1'), $processedConfig['access_control'][0]['ips']);
+    }
 }
