Skip to content

[FrameworkBundle] Enabled csrf_protection by default if form.csrf_protection is enabled #9662

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[FrameworkBundle] Enabled csrf_protection by default if form.csrf_protection is enabled #9662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,18 @@ public function load(array $configs, ContainerBuilder $container)

$loader->load('security.xml');

$this->registerSecurityCsrfConfiguration($config['csrf_protection'], $container, $loader);

if ($this->isConfigEnabled($container, $config['form'])) {
$this->formConfigEnabled = true;
$this->registerFormConfiguration($config, $container, $loader);
$config['validation']['enabled'] = true;

if ($this->isConfigEnabled($container, $config['form']['csrf_protection'])) {
$config['csrf_protection']['enabled'] = true;
}
}

$this->registerSecurityCsrfConfiguration($config['csrf_protection'], $container, $loader);

if (isset($config['templating'])) {
$this->registerTemplatingConfiguration($config['templating'], $config['ide'], $container, $loader);
}
Expand Down Expand Up @@ -159,10 +163,6 @@ private function registerFormConfiguration($config, ContainerBuilder $container,
{
$loader->load('form.xml');
if ($this->isConfigEnabled($container, $config['form']['csrf_protection'])) {
if (!$this->isConfigEnabled($container, $config['csrf_protection'])) {
throw new \LogicException('CSRF protection needs to be enabled in order to use CSRF protection for forms.');
}

$loader->load('form_csrf.xml');

$container->setParameter('form.type_extension.csrf.enabled', true);
Expand Down
10 changes: 4 additions & 6 deletions src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,11 @@ public function testCsrfProtectionNeedsSessionToBeEnabled()
$this->createContainerFromFile('csrf_needs_session');
}

/**
* @expectedException \LogicException
* @expectedExceptionMessage CSRF protection needs to be enabled in order to use CSRF protection for forms.
*/
public function testCsrfProtectionForFormsNeedCsrfProtectionToBeEnabled()
public function testCsrfProtectionForFormsEnablesCsrfProtectionAutomatically()
{
$this->createContainerFromFile('csrf');
$container = $this->createContainerFromFile('csrf');

$this->assertTrue($container->hasDefinition('security.csrf.token_manager'));
}

public function testSecureRandomIsAvailableIfCsrfIsDisabled()
Expand Down