Fix path detection in Server::requestUri

tobimori · Mar 23, 2022 · 9f9d224 · 9f9d224
1 parent 6b20fa1
commit 9f9d224
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/src/Http/Server.php b/src/Http/Server.php
@@ -268,7 +268,14 @@ public static function port(bool $forwarded = false): int
     public static function requestUri(): array
     {
         $uri = static::get('REQUEST_URI', '');
-        $uri = parse_url($uri);
+
+        if (Url::isAbsolute($uri) === true) {
+            $uri = parse_url($uri);
+        } else {
+            // the fake domain is needed to make sure the URL parsing is
+            // always correct. Even if there's a colon in the path for params
+            $uri = parse_url('http://getkirby.com' . $uri);
+        }
 
         return [
             'path'  => $uri['path']  ?? null,

diff --git a/tests/Http/ServerTest.php b/tests/Http/ServerTest.php
@@ -360,7 +360,7 @@ public function provideRequestUri(): array
             [
                 null,
                 [
-                    'path'  => '',
+                    'path'  => null,
                     'query' => null
                 ]
             ],
@@ -385,10 +385,24 @@ public function provideRequestUri(): array
                     'query' => 'foo=bar'
                 ]
             ],
+            [
+                '/foo/bar/page:2?foo=bar',
+                [
+                    'path'  => '/foo/bar/page:2',
+                    'query' => 'foo=bar'
+                ]
+            ],
+            [
+                '/foo/bar/page;2?foo=bar',
+                [
+                    'path'  => '/foo/bar/page;2',
+                    'query' => 'foo=bar'
+                ]
+            ],
             [
                 'index.php?foo=bar',
                 [
-                    'path'  => 'index.php',
+                    'path'  => null,
                     'query' => 'foo=bar'
                 ]
             ],