Make secret not be required
This commit is contained in:
parent
dda2f7cdb3
commit
8bc9f75642
@ -62,7 +62,7 @@ class Configuration implements ConfigurationInterface
|
|||||||
->end()
|
->end()
|
||||||
->end()
|
->end()
|
||||||
->scalarNode('trust_proxy_headers')->defaultFalse()->end()
|
->scalarNode('trust_proxy_headers')->defaultFalse()->end()
|
||||||
->scalarNode('secret')->isRequired()->end()
|
->scalarNode('secret')->end()
|
||||||
->scalarNode('ide')->defaultNull()->end()
|
->scalarNode('ide')->defaultNull()->end()
|
||||||
->booleanNode('test')->end()
|
->booleanNode('test')->end()
|
||||||
->scalarNode('default_locale')->defaultValue('en')->end()
|
->scalarNode('default_locale')->defaultValue('en')->end()
|
||||||
|
@ -59,7 +59,9 @@ class FrameworkExtension extends Extension
|
|||||||
$configuration = $this->getConfiguration($configs, $container);
|
$configuration = $this->getConfiguration($configs, $container);
|
||||||
$config = $this->processConfiguration($configuration, $configs);
|
$config = $this->processConfiguration($configuration, $configs);
|
||||||
|
|
||||||
|
if (isset($config['secret'])) {
|
||||||
$container->setParameter('kernel.secret', $config['secret']);
|
$container->setParameter('kernel.secret', $config['secret']);
|
||||||
|
}
|
||||||
|
|
||||||
$container->setParameter('kernel.trust_proxy_headers', $config['trust_proxy_headers']);
|
$container->setParameter('kernel.trust_proxy_headers', $config['trust_proxy_headers']);
|
||||||
|
|
||||||
@ -156,6 +158,9 @@ class FrameworkExtension extends Extension
|
|||||||
if (!isset($config['session'])) {
|
if (!isset($config['session'])) {
|
||||||
throw new \LogicException('CSRF protection needs that sessions are enabled.');
|
throw new \LogicException('CSRF protection needs that sessions are enabled.');
|
||||||
}
|
}
|
||||||
|
if (!isset($config['secret'])) {
|
||||||
|
throw new \LogicException('CSRF protection needs a secret to be set.');
|
||||||
|
}
|
||||||
$loader->load('form_csrf.xml');
|
$loader->load('form_csrf.xml');
|
||||||
|
|
||||||
$container->setParameter('form.type_extension.csrf.enabled', $config['csrf_protection']['enabled']);
|
$container->setParameter('form.type_extension.csrf.enabled', $config['csrf_protection']['enabled']);
|
||||||
|
Reference in New Issue
Block a user