[FrameworkBundle] used the new method for trusted proxies
This commit is contained in:
parent
cdb3eccd5b
commit
a0e2391063
@ -47,7 +47,15 @@ class Configuration implements ConfigurationInterface
|
||||
$rootNode
|
||||
->children()
|
||||
->scalarNode('charset')->end()
|
||||
->scalarNode('trust_proxy_headers')->defaultFalse()->end()
|
||||
->arrayNode('trusted_proxies')
|
||||
->prototype('scalar')
|
||||
->validate()
|
||||
->ifTrue(function($v) { return !filter_var($v, FILTER_VALIDATE_IP); })
|
||||
->thenInvalid('Invalid proxy IP "%s"')
|
||||
->end()
|
||||
->end()
|
||||
->end()
|
||||
->scalarNode('trust_proxy_headers')->defaultFalse()->end() // @deprecated, to be removed in 2.3
|
||||
->scalarNode('secret')->isRequired()->end()
|
||||
->scalarNode('ide')->defaultNull()->end()
|
||||
->booleanNode('test')->end()
|
||||
|
@ -62,6 +62,9 @@ class FrameworkExtension extends Extension
|
||||
}
|
||||
$container->setParameter('kernel.secret', $config['secret']);
|
||||
|
||||
$container->setParameter('kernel.trusted_proxies', $config['trusted_proxies']);
|
||||
|
||||
// @deprecated, to be removed in 2.3
|
||||
$container->setParameter('kernel.trust_proxy_headers', $config['trust_proxy_headers']);
|
||||
|
||||
if (!empty($config['test'])) {
|
||||
|
@ -37,8 +37,10 @@ class FrameworkBundle extends Bundle
|
||||
{
|
||||
public function boot()
|
||||
{
|
||||
if ($this->container->getParameter('kernel.trust_proxy_headers')) {
|
||||
Request::trustProxyData();
|
||||
if ($trustedProxies = $this->container->getParameter('kernel.trusted_proxies')) {
|
||||
Request::setTrustedProxies($trustedProxies);
|
||||
} elseif ($this->container->getParameter('kernel.trust_proxy_headers')) {
|
||||
Request::trustProxyData(); // @deprecated, to be removed in 2.3
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user