Return from maintenance middleware early if URL is excluded (#48218)

laravel · Aug 28, 2023 · 12b20c3 · 12b20c3
1 parent 40b6059
commit 12b20c3
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 2 deletions.
diff --git a/src/Illuminate/Foundation/Http/Middleware/PreventRequestsDuringMaintenance.php b/src/Illuminate/Foundation/Http/Middleware/PreventRequestsDuringMaintenance.php
@@ -45,15 +45,18 @@ public function __construct(Application $app)
      */
     public function handle($request, Closure $next)
     {
+        if ($this->inExceptArray($request)) {
+            return $next($request);
+        }
+
         if ($this->app->maintenanceMode()->active()) {
             $data = $this->app->maintenanceMode()->data();
 
             if (isset($data['secret']) && $request->path() === $data['secret']) {
                 return $this->bypassResponse($data['secret']);
             }
 
-            if ($this->hasValidBypassCookie($request, $data) ||
-                $this->inExceptArray($request)) {
+            if ($this->hasValidBypassCookie($request, $data)) {
                 return $next($request);
             }
 

diff --git a/tests/Integration/Foundation/MaintenanceModeTest.php b/tests/Integration/Foundation/MaintenanceModeTest.php
@@ -11,11 +11,19 @@
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Route;
+use Orchestra\Testbench\Http\Middleware\PreventRequestsDuringMaintenance as TestbenchPreventRequestsDuringMaintenance;
 use Orchestra\Testbench\TestCase;
 use Symfony\Component\HttpFoundation\Cookie;
 
 class MaintenanceModeTest extends TestCase
 {
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->withoutMiddleware(TestbenchPreventRequestsDuringMaintenance::class);
+    }
+
     protected function tearDown(): void
     {
         @unlink(storage_path('framework/down'));
@@ -113,6 +121,25 @@ public function testMaintenanceModeCanBeBypassedWithValidCookie()
         $this->assertSame('Hello World', $response->original);
     }
 
+    public function testMaintenanceModeCanBeBypassedOnExcludedUrls()
+    {
+        $this->app->instance(PreventRequestsDuringMaintenance::class, new class($this->app) extends PreventRequestsDuringMaintenance
+        {
+            protected $except = ['/test'];
+        });
+
+        file_put_contents(storage_path('framework/down'), json_encode([
+            'retry' => 60,
+        ]));
+
+        Route::get('/test', fn () => 'Hello World')->middleware(PreventRequestsDuringMaintenance::class);
+
+        $response = $this->get('/test');
+
+        $response->assertStatus(200);
+        $this->assertSame('Hello World', $response->original);
+    }
+
     public function testMaintenanceModeCantBeBypassedWithInvalidCookie()
     {
         file_put_contents(storage_path('framework/down'), json_encode([