solved host problem

laravel · Jun 7, 2020 · 2f8f0a9 · 2f8f0a9
1 parent f30df69
commit 2f8f0a9
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/src/Http/Middleware/EnsureFrontendRequestsAreStateful.php b/src/Http/Middleware/EnsureFrontendRequestsAreStateful.php
@@ -3,6 +3,7 @@
 namespace Laravel\Sanctum\Http\Middleware;
 
 use Illuminate\Routing\Pipeline;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 
 class EnsureFrontendRequestsAreStateful
@@ -58,9 +59,15 @@ public static function fromFrontend($request)
 
         $referer = Str::replaceFirst('http://', '', $referer);
 
+        $referer = Str::endsWith('/', $referer) ? $referer : "{$referer}/";
+
         $stateful = array_filter(config('sanctum.stateful', []));
 
-        return Str::startsWith($referer, $stateful) ||
-               Str::is($stateful, $referer);
+        $stateful = Collection::make($stateful)->map(function ($uri) {
+                        $uri = Str::endsWith('/', $uri) ? Str::replaceLast('/', '', $uri) : $uri;
+                        return "{$uri}/*";
+                    })->all();
+
+        return Str::is($stateful, $referer);
     }
 }
diff --git a/tests/EnsureFrontendRequestsAreStatefulTest.php b/tests/EnsureFrontendRequestsAreStatefulTest.php
@@ -25,6 +25,16 @@ public function test_request_referer_is_parsed_against_configuration()
         $request->headers->set('referer', 'https://wrong.com');
 
         $this->assertFalse(EnsureFrontendRequestsAreStateful::fromFrontend($request));
+
+        $request = Request::create('/');
+        $request->headers->set('referer', 'https://test.com.x');
+
+        $this->assertFalse(EnsureFrontendRequestsAreStateful::fromFrontend($request));
+
+        $request = Request::create('/');
+        $request->headers->set('referer', 'https://foobar.test.com/xxx');
+
+        $this->assertTrue(EnsureFrontendRequestsAreStateful::fromFrontend($request));
     }
 
     public function test_wildcard_matching()