diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
index 670d9263f45f4..25778ea851dd7 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
@@ -222,7 +222,7 @@ private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $facto
if (isset($v['csrf_token_generator'])) {
$v['enable_csrf'] = true;
} elseif ($v['enable_csrf']) {
- $v['csrf_token_generator'] = 'security.csrf.token_generator';
+ $v['csrf_token_generator'] = 'security.csrf.token_manager';
}
return $v;
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/MainConfigurationTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/MainConfigurationTest.php
index c64a7b49ba56d..20bc11269fa6f 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/MainConfigurationTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/MainConfigurationTest.php
@@ -122,7 +122,7 @@ public function testLogoutCsrf()
$assertions = [
'custom_token_generator' => [true, 'a_token_generator'],
- 'default_token_generator' => [true, 'security.csrf.token_generator'],
+ 'default_token_generator' => [true, 'security.csrf.token_manager'],
'disabled_csrf' => [false, null],
'empty' => [false, null],
];
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/LogoutTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/LogoutTest.php
index 5da52d9602a49..72ed1be80d077 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/LogoutTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/LogoutTest.php
@@ -69,6 +69,19 @@ public function testCookieClearingOnLogout()
$this->assertNull($cookieJar->get('flavor'));
}
+ public function testEnabledCsrf()
+ {
+ $client = $this->createClient(['test_case' => 'Logout', 'root_config' => 'config_csrf_enabled.yml']);
+
+ $cookieJar = $client->getCookieJar();
+ $cookieJar->set(new Cookie('flavor', 'chocolate', strtotime('+1 day'), null, 'somedomain'));
+
+ $client->request('POST', '/login', ['_username' => 'johannes', '_password' => 'test']);
+ $client->request('GET', '/logout');
+
+ $this->assertResponseStatusCodeSame(Response::HTTP_FORBIDDEN);
+ }
+
private function callInRequestContext(KernelBrowser $client, callable $callable): void
{
/** @var EventDispatcherInterface $eventDispatcher */
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/Logout/config_csrf_enabled.yml b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/Logout/config_csrf_enabled.yml
new file mode 100644
index 0000000000000..9d05c34a5d11c
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/Logout/config_csrf_enabled.yml
@@ -0,0 +1,25 @@
+imports:
+- { resource: ./../config/framework.yml }
+
+security:
+ password_hashers:
+ Symfony\Component\Security\Core\User\InMemoryUser: plaintext
+
+ providers:
+ in_memory:
+ memory:
+ users:
+ johannes: { password: test, roles: [ROLE_USER] }
+
+ firewalls:
+ default:
+ form_login:
+ check_path: login
+ remember_me: true
+ require_previous_session: false
+ logout:
+ enable_csrf: true
+
+ access_control:
+ - { path: ^/login$, roles: IS_AUTHENTICATED_ANONYMOUSLY }
+ - { path: .*, roles: IS_AUTHENTICATED_FULLY }
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy