Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

SA-CORE-2025-001 by larsdesigns, bdanin, nuwans, dgroene, arkepp, juanramonperez, svendecabooter, wgunn_e, mcdruid, catch

merge-requests/11262/head
Dave Long 2025-02-18 22:40:28 +00:00
parent 98dba77787
commit c1b8906979
No known key found for this signature in database
GPG Key ID: ED52AE211E142771
3 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/lib/Drupal/Core/DrupalKernel.php
View File

@ -747,6 +747,7 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
if ($e instanceof HttpExceptionInterface) {
$response = new Response($e->getMessage(), $e->getStatusCode());
$response->headers->add($e->getHeaders());
$response->headers->set('Content-Type', 'text/plain');
return $response;
}

15
core/lib/Drupal/Core/EventSubscriber/DefaultExceptionHtmlSubscriber.php
View File

@ -87,21 +87,14 @@ class DefaultExceptionHtmlSubscriber extends HttpExceptionSubscriberBase {
* The event to process.
*/
public function on4xx(ExceptionEvent $event) {
if (($exception = $event->getThrowable()) && $exception instanceof HttpExceptionInterface) {
// Avoid making a subrequest for 400 errors because the same conditions that
// caused the 400 error could also happen in the subrequest. This allows 400
// exceptions to fall through to FinalExceptionSubscriber::on4xx.
if (($exception = $event->getThrowable()) && $exception instanceof HttpExceptionInterface && $exception->getStatusCode() > 400) {
$this->makeSubrequest($event, '/system/4xx', $exception->getStatusCode());
}
}
/**
* Handles a 400 error for HTML.
*
* @param \Symfony\Component\HttpKernel\Event\ExceptionEvent $event
* The event to process.
*/
public function on400(ExceptionEvent $event): void {
throw $event->getThrowable();
}
/**
* Handles a 401 error for HTML.
*

5
core/tests/Drupal/KernelTests/Core/EventSubscriber/ExceptionLoggingSubscriberTest.php
View File

@ -9,7 +9,6 @@ use Drupal\Core\Logger\RfcLogLevel;
use Drupal\KernelTests\KernelTestBase;
use Symfony\Component\ErrorHandler\BufferingLogger;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Exception\HttpException;
/**
* Tests that HTTP exceptions are logged correctly.
@ -64,9 +63,7 @@ class ExceptionLoggingSubscriberTest extends KernelTestBase {
public static function exceptionDataProvider(): array {
return [
// When a BadRequestException is thrown, DefaultHttpExceptionSubscriber
// will rethrow the exception.
[400, 'client error', RfcLogLevel::WARNING, HttpException::class],
[400, 'client error', RfcLogLevel::WARNING],
[401, 'client error', RfcLogLevel::WARNING],
[403, 'access denied', RfcLogLevel::WARNING],
[404, 'page not found', RfcLogLevel::WARNING],