wip

Author: tadhgboyle

core/classes/Middleware/AbstractMiddleware.php

@@ -2,5 +2,7 @@
 
 abstract class AbstractMiddleware
 {
-    abstract public function type(): MiddlewareType;
+    public MiddlewareType $type = MiddlewareType::Global;
+
+    public array $exemptRoutes = [];
 }

core/classes/Middleware/MiddlewareHandler.php

@@ -1,6 +1,7 @@
 <?php
 
 use DI\Container;
+use Symfony\Component\HttpFoundation\Request;
 
 class MiddlewareHandler extends Instanceable
 {
@@ -35,8 +36,15 @@ public function call(MiddlewareType $type, Container $container)
 
         foreach ($middlewareClasses as $class) {
             $middleware = $container->get($class);
+            $request = $container->get(Request::class);
 
-            if ($middleware->type() === $type) {
+            foreach ($middleware->exemptRoutes as $exemptedRoute) {
+                if (str_starts_with($request->get('route'), $exemptedRoute)) {
+                    continue 2; // Skip this middleware if the route is exempted
+                }
+            }
+
+            if ($middleware->type === $type) {
                 $container->call([$middleware, 'handle']);
             }
         }

modules/Core/classes/Middleware/Frontend/EnsureUserIntegrationsLinkedMiddleware.php

@@ -2,10 +2,7 @@
 
 class EnsureUserIntegrationsLinkedMiddleware extends AbstractMiddleware
 {
-    public function type(): MiddlewareType
-    {
-        return MiddlewareType::Frontend;
-    }
+    public MiddlewareType $type = MiddlewareType::Frontend;
 
     public function handle(User $user, Language $language): void
     {

modules/Core/classes/Middleware/Frontend/GlobalWarningsMiddleware.php

@@ -2,10 +2,7 @@
 
 class GlobalWarningsMiddleware extends AbstractMiddleware
 {
-    public function type(): MiddlewareType
-    {
-        return MiddlewareType::Frontend;
-    }
+    public MiddlewareType $type = MiddlewareType::Frontend;
 
     public function handle(User $user, Language $language, TemplateBase $template): void
     {

modules/Core/classes/Middleware/Global/BannedUserMiddleware.php

@@ -11,11 +11,6 @@
  */
 class BannedUserMiddleware extends AbstractMiddleware
 {
-    public function type(): MiddlewareType
-    {
-        return MiddlewareType::Global;
-    }
-
     public function handle(User $user, Language $language): void
     {
         if (($user->isLoggedIn() && $user->data()->isbanned) || DB::getInstance()->get('ip_bans', ['ip', HttpUtils::getRemoteAddress()])->exists()) {

modules/Core/classes/Middleware/Global/MaintenanceModeMiddleware.php

@@ -1,7 +1,5 @@
 <?php
 
-use Symfony\Component\HttpFoundation\Request;
-
 /**
  * Maintenance Mode middleware hook.
  * Redirects non-admin users when maintenance mode is enabled.
@@ -13,7 +11,7 @@
  */
 class MaintenanceModeMiddleware extends AbstractMiddleware
 {
-    private const EXEMPTED_ROUTES = [
+    public array $exemptRoutes = [
         '/maintenance',
         '/login',
         '/forgot_password',
@@ -23,12 +21,7 @@ class MaintenanceModeMiddleware extends AbstractMiddleware
         '/store/listener',
     ];
 
-    public function type(): MiddlewareType
-    {
-        return MiddlewareType::Global;
-    }
-
-    public function handle(User $user, Request $request): void
+    public function handle(User $user): void
     {
         // Check if maintenance mode is enabled
         if (!Settings::get('maintenance')) {
@@ -42,13 +35,6 @@ public function handle(User $user, Request $request): void
             return;
         }
 
-        $route = $request->get('route');
-        foreach (self::EXEMPTED_ROUTES as $exempted_route) {
-            if (str_starts_with($route, $exempted_route)) {
-                return;
-            }
-        }
-
         Redirect::to(URL::build('/maintenance'));
     }
 }

modules/Core/classes/Middleware/Global/TFAMiddleware.php

@@ -13,32 +13,18 @@
  */
 class TFAMiddleware extends AbstractMiddleware
 {
-    private const EXEMPTED_ROUTES = [
+    public array $exemptRoutes = [
         '/logout',
         '/user/settings' // Allow access to settings to enable TFA
     ];
 
-    public function type(): MiddlewareType
-    {
-        return MiddlewareType::Global;
-    }
-
     public function handle(User $user, Request $request, Language $language): void
     {
         // Only process for logged-in users
         if (!$user->isLoggedIn()) {
             return;
         }
 
-        // Allow access to exempted routes
-        $route = $request->get('route');
-        foreach (self::EXEMPTED_ROUTES as $exempted_route) {
-            // Ideally we can use $request->getPathInfo(), but our routing allows a following slash
-            if (str_starts_with($route, $exempted_route)) {
-                return;
-            }
-        }
-
         // Skip if AJAX request, such as Alert or PM checks
         if ($request->isXmlHttpRequest()) {
             return;