Skip to content

Commit 5845388

Browse files
committed
Disallowed ability to use csv ips list from static string
1 parent eb570f3 commit 5845388

File tree

2 files changed

+1
-19
lines changed

2 files changed

+1
-19
lines changed

src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ private function addAccessControlSection(ArrayNodeDefinition $rootNode)
142142
->scalarNode('host')->defaultNull()->end()
143143
->integerNode('port')->defaultNull()->end()
144144
->arrayNode('ips')
145-
->beforeNormalization()->ifString()->then(function ($v) { return preg_split('/\s*,\s*/', $v); })->end()
145+
->beforeNormalization()->ifString()->then(function ($v) { return [$v]; })->end()
146146
->prototype('scalar')->end()
147147
->end()
148148
->arrayNode('methods')

src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/MainConfigurationTest.php

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -112,22 +112,4 @@ public function testUserCheckers()
112112

113113
$this->assertEquals('app.henk_checker', $processedConfig['firewalls']['stub']['user_checker']);
114114
}
115-
116-
public function testCommaSeparatedIps()
117-
{
118-
$config = [
119-
'access_control' => [
120-
[
121-
'ips' => '127.0.0.1, ::1',
122-
],
123-
],
124-
];
125-
$config = array_merge(static::$minimalConfig, $config);
126-
127-
$processor = new Processor();
128-
$configuration = new MainConfiguration([], []);
129-
$processedConfig = $processor->processConfiguration($configuration, [$config]);
130-
131-
$this->assertEquals(['127.0.0.1', '::1'], $processedConfig['access_control'][0]['ips']);
132-
}
133115
}

0 commit comments

Comments
 (0)