diff --git a/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php b/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php
index 0232917687670..a1dfa27855fa2 100644
--- a/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php
@@ -102,7 +102,7 @@ public function onKernelException(GetResponseForExceptionEvent $event)
}
if ($exception instanceof LogoutException) {
- $this->handleLogoutException($exception);
+ $this->handleLogoutException($event, $exception);
return;
}
@@ -172,10 +172,12 @@ private function handleAccessDeniedException(GetResponseForExceptionEvent $event
}
}
- private function handleLogoutException(LogoutException $exception)
+ private function handleLogoutException(GetResponseForExceptionEvent $event, LogoutException $exception)
{
+ $event->setException(new AccessDeniedHttpException($exception->getMessage(), $exception));
+
if (null !== $this->logger) {
- $this->logger->info('A LogoutException was thrown.', ['exception' => $exception]);
+ $this->logger->info('A LogoutException was thrown; wrapping with AccessDeniedHttpException', ['exception' => $exception]);
}
}
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/ExceptionListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/ExceptionListenerTest.php
index 29899de11f957..74d366311c5ff 100644
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/ExceptionListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/ExceptionListenerTest.php
@@ -21,6 +21,7 @@
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
use Symfony\Component\Security\Core\Exception\AuthenticationException;
+use Symfony\Component\Security\Core\Exception\LogoutException;
use Symfony\Component\Security\Http\Authorization\AccessDeniedHandlerInterface;
use Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface;
use Symfony\Component\Security\Http\Firewall\ExceptionListener;
@@ -160,6 +161,17 @@ public function testAccessDeniedExceptionNotFullFledged(\Exception $exception, \
$this->assertSame(null === $eventException ? $exception : $eventException, $event->getException()->getPrevious());
}
+ public function testLogoutException()
+ {
+ $event = $this->createEvent(new LogoutException('Invalid CSRF.'));
+
+ $listener = $this->createExceptionListener();
+ $listener->onKernelException($event);
+
+ $this->assertEquals('Invalid CSRF.', $event->getException()->getMessage());
+ $this->assertEquals(403, $event->getException()->getStatusCode());
+ }
+
public function getAccessDeniedExceptionProvider()
{
return [
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