Do not decode path before matching

amphp · Jul 4, 2024 · 0d6f7a3 · 0d6f7a3
1 parent c0434ad
commit 0d6f7a3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/Router.php b/src/Router.php
@@ -74,7 +74,7 @@ public function handleRequest(Request $request): Response
         }
 
         $method = $request->getMethod();
-        $path = \rawurldecode($request->getUri()->getPath());
+        $path = $request->getUri()->getPath();
 
         $toMatch = "{$method}\0{$path}";
 
@@ -90,7 +90,7 @@ public function handleRequest(Request $request): Response
                  * @var array<string, string> $routeArgs
                  */
                 [, $requestHandler, $routeArgs] = $match;
-                $request->setAttribute(self::class, $routeArgs);
+                $request->setAttribute(self::class, \array_map(\rawurldecode(...), $routeArgs));
 
                 return $requestHandler->handleRequest($request);
 

diff --git a/test/RouterTest.php b/test/RouterTest.php
@@ -209,16 +209,18 @@ public function testMerge(): void
 
     public function testPathIsMatchedDecoded(): void
     {
-        $requestHandler = new ClosureRequestHandler(function () {
+        $requestHandler = new ClosureRequestHandler(function (Request $request) {
+            self::assertSame(['s1' => 'ba /r', 's2' => 'baΩ%'], $request->getAttribute(Router::class));
+
             return new Response(HttpStatus::OK);
         });
 
         $router = new Router($this->server, $this->testLogger, $this->errorHandler);
-        $router->addRoute("GET", "/fo+ö", $requestHandler);
+        $router->addRoute("GET", "/fo+" . \rawurlencode("ö") . "/{s1}/{s2}", $requestHandler);
 
         $this->server->start($router, $this->errorHandler);
 
-        $uri = "/fo+" . \rawurlencode("ö");
+        $uri = "/fo+" . \rawurlencode("ö") . '/' . \rawurlencode("ba /r") . '/' . \rawurlencode("baΩ%");
 
         $request = new Request($this->createMock(Client::class), "GET", Uri\Http::createFromString($uri));
         $response = $router->handleRequest($request);