8000 [FrameworkBundle] fixed trusted_proxies configuration for some edge c… · imageoptimiser/symfony@4517aeb · GitHub
[go: up one dir, main page]
Skip to content

Commit 4517aeb

Browse files
fabpotfabpot
committed
[FrameworkBundle] fixed trusted_proxies configuration for some edge cases
1 parent 0085798 commit 4517aeb

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ public function getConfigTreeBuilder()
4949
->scalarNode('charset')->end()
5050
->arrayNode('trusted_proxies')
5151
->beforeNormalization()
52-
->ifTrue(function($v) { return !is_array($v); })
53-
->then(function($v) { return preg_split('/\s*,\s*/', $v); })
52+
->ifTrue(function($v) { return !is_array($v) && !is_null($v); })
53+
->then(function($v) { return is_bool($v) ? array() : preg_split('/\s*,\s*/', $v); })
5454
->end()
5555
->prototype('scalar')
5656
->validate()
57-
->ifTrue(function($v) { return !filter_var($v, FILTER_VALIDATE_IP); })
57+
->ifTrue(function($v) { return !empty($v) && !filter_var($v, FILTER_VALIDATE_IP); })
5858
->thenInvalid('Invalid proxy IP "%s"')
5959
->end()
6060
->end()

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ public function getTestValidTrustedProxiesData()
5353
array(array('secret' => 's3cr3t', 'trusted_proxies' => array('127.0.0.1')), array('secret' => 's3cr3t', 'trusted_proxies' => array('127.0.0.1'), 'trust_proxy_headers' => false, 'ide' => NULL, 'annotations' => array('cache' => 'file', 'file_cache_dir' => '%kernel.cache_dir%/annotations', 'debug' => false))),
5454
array(array('secret' => 's3cr3t', 'trusted_proxies' => array('::1')), array('secret' => 's3cr3t', 'trusted_proxies' => array('::1'), 'trust_proxy_headers' => false, 'ide' => NULL, 'annotations' => array('cache' => 'file', 'file_cache_dir' => '%kernel.cache_dir%/annotations', 'debug' => false))),
5555
array(array('secret' => 's3cr3t', 'trusted_proxies' => array('127.0.0.1', '::1')), array('secret' => 's3cr3t', 'trusted_proxies' => array('127.0.0.1', '::1'), 'trust_proxy_headers' => false, 'ide' => NULL, 'annotations' => array('cache' => 'file', 'file_cache_dir' => '%kernel.cache_dir%/annotations', 'debug' => false))),
56+
array(array('secret' => 's3cr3t', 'trusted_proxies' => null), array('secret' => 's3cr3t', 'trusted_proxies' => array(), 'trust_proxy_headers' => false, 'ide' => NULL, 'annotations' => array('cache' => 'file', 'file_cache_dir' => '%kernel.cache_dir%/annotations', 'debug' => false))),
57+
array(array('secret' => 's3cr3t', 'trusted_proxies' => false), array('secret' => 's3cr3t', 'trusted_proxies' => array(), 'trust_proxy_headers' => false, 'ide' => NULL, 'annotations' => array('cache' => 'file', 'file_cache_dir' => '%kernel.cache_dir%/annotations', 'debug' => false))),
58+
array(array('secret' => 's3cr3t', 'trusted_proxies' => array()), array('secret' => 's3cr3t', 'trusted_proxies' => array(), 'trust_proxy_headers' => false, 'ide' => NULL, 'annotations' => array('cache' => 'file', 'file_cache_dir' => '%kernel.cache_dir%/annotations', 'debug' => false))),
5659
);
5760
}
5861

0 commit comments

Comments
 (0)
0