Skip to content

[Security] revert trying different CSRF tokens in logout listener #62086

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
xabbuh wants to merge 1 commit into from
Closed

[Security] revert trying different CSRF tokens in logout listener #62086

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
2 changes: 1 addition & 1 deletion src/Symfony/Component/Security/Http/Firewall/LogoutListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public function authenticate(RequestEvent $event): void
$request = $event->getRequest();

if (null !== $this->csrfTokenManager) {
$csrfToken = ParameterBagUtils::getRequestParameterValue($request, $this->options['csrf_parameter'], $request->request->all());
$csrfToken = ParameterBagUtils::getRequestParameterValue($request, $this->options['csrf_parameter']);

if (!\is_string($csrfToken) || false === $this->csrfTokenManager->isTokenValid(new CsrfToken($this->options['csrf_token_id'], $csrfToken))) {
throw new LogoutException('Invalid CSRF token.');
Expand Down
56 changes: 12 additions & 44 deletions src/Symfony/Component/Security/Http/Tests/Firewall/LogoutListenerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,23 +50,26 @@ public function testHandleUnmatchedPath()
$this->assertFalse($logoutEventDispatched, 'LogoutEvent should not have been dispatched.');
}

public function testHandleMatchedPathWithCsrfValidation()
/**
* @dataProvider requestWithCsrfTokenProvider
*/
public function testHandleMatchedPathWithCsrfValidation(Request $request)
{
$tokenManager = $this->getTokenManager();
$dispatcher = $this->getEventDispatcher();

[$listener, $tokenStorage, $httpUtils, $options] = $this->getListener($dispatcher, $tokenManager);

$request = new Request();
$request->query->set('_csrf_token', 'token');

$httpUtils->expects($this->once())
->method('checkRequestPath')
->with($request, $options['logout_path'])
->willReturn(true);

$tokenManager->expects($this->once())
->method('isTokenValid')
->with($this->callback(static function (CsrfToken $token): bool {
return 'token' === $token->getValue();
}))
->willReturn(true);

$response = new Response();
Expand All @@ -89,47 +92,12 @@ public function testHandleMatchedPathWithCsrfValidation()
$this->assertSame($response, $event->getResponse());
}

public function testHandleMatchedPathWithCsrfInQueryParamAndBody()
public function requestWithCsrfTokenProvider()
{
$tokenManager = $this->getTokenManager();
$dispatcher = $this->getEventDispatcher();

[$listener, $tokenStorage, $httpUtils, $options] = $this->getListener($dispatcher, $tokenManager);

$request = new Request();
$request->query->set('_csrf_token', 'token');
$request->request->set('_csrf_token', 'token2');

$httpUtils->expects($this->once())
->method('checkRequestPath')
->with($request, $options['logout_path'])
->willReturn(true);

$tokenManager->expects($this->once())
->method('isTokenValid')
->with($this->callback(function ($token) {
return $token instanceof CsrfToken && 'token2' === $token->getValue();
}))
->willReturn(true);

$response = new Response();
$dispatcher->addListener(LogoutEvent::class, function (LogoutEvent $event) use ($response) {
$event->setResponse($response);
});

$tokenStorage->expects($this->once())
->method('getToken')
->willReturn($token = $this->getToken());

$tokenStorage->expects($this->once())
->method('setToken')
->with(null);

$event = new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MAIN_REQUEST);

$listener($event);

$this->assertSame($response, $event->getResponse());
return [
'GET' => [Request::create('/', 'GET', ['_csrf_token' => 'token'])],
'POST' => [Request::create('/', 'POST', ['_csrf_token' => 'token'])],
];
}

public function testHandleMatchedPathWithoutCsrfValidation()
Expand Down
Loading