Fix a potential error if the URL has percentage in it

aschempp · Aug 3, 2020 · 8ae2582 · 8ae2582
1 parent 5d53b99
commit 8ae2582
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/core-bundle/src/Routing/RouteProvider.php b/core-bundle/src/Routing/RouteProvider.php
@@ -66,8 +66,8 @@ public function getRouteCollectionForRequest(Request $request): RouteCollection
 
         $pathInfo = rawurldecode($request->getPathInfo());
 
-        // The request string must not contain "auto_item" (see #4012)
-        if (false !== strpos($pathInfo, '/auto_item/')) {
+        // The request string must not contain "auto_item" (see #4012) or a percentage character
+        if (false !== strpos($pathInfo, '/auto_item/') || false !== strpos($pathInfo, '%')) {
             return new RouteCollection();
         }
 

diff --git a/core-bundle/tests/Routing/RouteProviderTest.php b/core-bundle/tests/Routing/RouteProviderTest.php
@@ -178,6 +178,13 @@ public function testReturnsAnEmptyCollectionIfThePathContainsAutoItem(): void
         $this->assertEmpty($this->getRouteProvider()->getRouteCollectionForRequest($request));
     }
 
+    public function testReturnsAnEmptyCollectionIfThePathContainsPercentageCharacter(): void
+    {
+        $request = $this->mockRequestWithPath('/drachenlochmuseum-v%25c3%25a4ttis.html');
+
+        $this->assertEmpty($this->getRouteProvider()->getRouteCollectionForRequest($request));
+    }
+
     public function testReturnsAnEmptyCollectionIfTheUrlSuffixDoesNotMatch(): void
     {
         $request = $this->mockRequestWithPath('/foo.php');