From a2ebbe0596d1126d1e3616c29f3533d87fc6c254 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= Date: Tue, 19 Nov 2024 10:11:43 +0100 Subject: [PATCH] [HttpKernel] Ensure HttpCache::getTraceKey() does not throw exception --- .../Component/HttpKernel/HttpCache/HttpCache.php | 7 ++++++- .../HttpKernel/Tests/HttpCache/HttpCacheTest.php | 11 +++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php index 9bffc8add01db..6c2bdd969c16e 100644 --- a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php +++ b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php @@ -17,6 +17,7 @@ namespace Symfony\Component\HttpKernel\HttpCache; +use Symfony\Component\HttpFoundation\Exception\SuspiciousOperationException; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\HttpKernelInterface; @@ -715,7 +716,11 @@ private function getTraceKey(Request $request): string $path .= '?'.$qs; } - return $request->getMethod().' '.$path; + try { + return $request->getMethod().' '.$path; + } catch (SuspiciousOperationException $e) { + return '_BAD_METHOD_ '.$path; + } } /** diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php index 2a9f48463c842..b1ef34cae783b 100644 --- a/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php @@ -61,6 +61,17 @@ public function testPassesOnNonGetHeadRequests() $this->assertFalse($this->response->headers->has('Age')); } + public function testPassesSuspiciousMethodRequests() + { + $this->setNextResponse(200); + $this->request('POST', '/', ['HTTP_X-HTTP-Method-Override' => '__CONSTRUCT']); + $this->assertHttpKernelIsCalled(); + $this->assertResponseOk(); + $this->assertTraceNotContains('stale'); + $this->assertTraceNotContains('invalid'); + $this->assertFalse($this->response->headers->has('Age')); + } + public function testInvalidatesOnPostPutDeleteRequests() { foreach (['post', 'put', 'delete'] as $method) { 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