8000 [HttpKernel][FrameworkBundle] Turn HTTP exceptions to HTTP status cod… · symfony/symfony@1c9fc7a · GitHub
[go: up one dir, main page]
Skip to content

Commit 1c9fc7a

Browse files
nicolas-grekasnicolas-grekas
committed
[HttpKernel][FrameworkBundle] Turn HTTP exceptions to HTTP status codes by default
1 parent 50c4384 commit 1c9fc7a

File tree

3 files changed

+59
-3
lines changed

3 files changed

+59
-3
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,16 @@
6767
<argument type="service" id="router" on-invalid="ignore" />
6868
</service>
6969

70+
<service id="http_exception_listener" class="Symfony\Component\HttpKernel\EventListener\ExceptionListener">
71+
<tag name="kernel.event_listener" event="kernel.exception" method="onKernelException" priority="-2048" />
72+
<tag name="kernel.reset" method="reset" />
73+
<argument>null</argument>
74+
<argument>null</argument>
75+
<argument>%kernel.debug%</argument>
76+
<argument>%kernel.charset%</argument>
77+
<argument>%debug.file_link_format%</argument>
78+
</service>
79+
7080
<service id="validate_request_listener" class="Symfony\Component\HttpKernel\EventListener\ValidateRequestListener">
7181
<tag name="kernel.event_subscriber" />
7282
</service>

‎src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php‎

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@
1313

1414
use Psr\Log\LoggerInterface;
1515
use Symfony\Component\Debug\Exception\FlattenException;
16+
use Symfony\Component\Debug\ExceptionHandler;
1617
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
1718
use Symfony\Component\HttpFoundation\Request;
19+
use Symfony\Component\HttpFoundation\Response;
1820
use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
1921
use Symfony\Component\HttpKernel\Log\DebugLoggerInterface;
2022
use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
@@ -33,12 +35,17 @@ class ExceptionListener implements EventSubscriberInterface
3335
protected $controller;
3436
protected $logger;
3537
protected $debug;
38+
private $charset;
39+
private $fileLinkFormat;
40+
private $isTerminating = false;
3641

37-
public function __construct($controller, LoggerInterface $logger = null, $debug = false)
42+
public function __construct($controller, LoggerInterface $logger = null, $debug = false, $charset = null, $fileLinkFormat = null)
3843
{
3944
$this->controller = $controller;
4045
$this->logger = $logger;
4146
$this->debug = $debug;
47+
$this->charset = $charset;
48+
$this->fileLinkFormat = $fileLinkFormat;
4249
}
4350

4451
public function logKernelException(GetResponseForExceptionEvent $event)
@@ -51,6 +58,17 @@ public function logKernelException(GetResponseForExceptionEvent $event)
5158

5259
public function onKernelException(GetResponseForExceptionEvent $event)
5360
{
61+
if (null === $this->controller) {
62+
if (!$event->isMasterRequest()) {
63+
return;
64+
}
65+
if (!$this->isTerminating) {
66+
$this->isTerminating = true;
67+
68+
return;
69+
}
70+
$this->isTerminating = false;
71+
}
5472
$exception = $event->getException();
5573
$request = $this->duplicateRequest($exception, $event->getRequest());
5674
$eventDispatcher = func_num_args() > 2 ? func_get_arg(2) : null;
@@ -86,6 +104,11 @@ public function onKernelException(GetResponseForExceptionEvent $event)
86104
}
87105
}
88106

107+
public function reset()
108+
{
109+
$this->isTerminating = false;
110+
}
111+
89112
public static function getSubscribedEvents()
90113
{
91114
return array(
@@ -124,8 +147,12 @@ protected function logException(\Exception $exception, $message)
124147
protected function duplicateRequest(\Exception $exception, Request $request)
125148
{
126149
$attributes = array(
127-
'_controller' => $this->controller,
128-
'exception' => FlattenException::create($exception),
150+
'exception' => $exception = FlattenException::create($exception),
151+
'_controller' => $this->controller ?: function () use ($exception) {
152+
$handler = new ExceptionHandler($this->debug, $this->charset, $this->fileLinkFormat);
153+
154+
return new Response($handler->getHtml($exception), $exception->getStatusCode(), $exception->getHeaders());
155+
},
129156
'logger' => $this->logger instanceof DebugLoggerInterface ? $this->logger : null,
130157
);
131158
$request = $request->duplicate(null, null, $attributes);

‎src/Symfony/Component/HttpKernel/Tests/EventListener/ExceptionListenerTest.php‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,25 @@ public function testCSPHeaderIsRemoved()
155155
$this->assertFalse($response->headers->has('content-security-policy'), 'CSP header has been removed');
156156
$this->assertFalse($dispatcher->hasListeners(KernelEvents::RESPONSE), 'CSP removal listener has been removed');
157157
}
158+
159+
public function testNullController()
160+
{
161+
$listener = new ExceptionListener(null);
162+
$kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
163+
$kernel->expects($this->once())->method('handle')->will($this->returnCallback(function (Request $request) {
164+
$controller = $request->attributes->get('_controller');
165+
166+
return $controller();
167+
}));
168+
$request = Request::create('/');
169+
$event = new GetResponseForExceptionEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST, new \Exception('foo'));
170+
171+
$listener->onKernelException($event);
172+
$this->assertNull($event->getResponse());
173+
174+
$listener->onKernelException($event);
175+
$this->assertContains('Whoops, looks like something went wrong.', $event->getResponse()->getContent());
176+
}
158177
}
159178

160179
class TestLogger extends Logger implements DebugLoggerInterface

0 commit comments

Comments
 (0)
0