From 1b0e2e12573187560cb3b41c76033185baa41ade Mon Sep 17 00:00:00 2001
From: MarioZet <89627138+MarioZet23@users.noreply.github.com>
Date: Sun, 29 Sep 2024 20:08:39 +0200
Subject: [PATCH] Feat. Apply all middlewares from labels to coolify router,
 instead of only basicauth and redirect

---
 bootstrap/helpers/docker.php | 81 +++++++++++-------------------------
 1 file changed, 24 insertions(+), 57 deletions(-)

diff --git a/bootstrap/helpers/docker.php b/bootstrap/helpers/docker.php
index e252bda10..7e902fcdd 100644
--- a/bootstrap/helpers/docker.php
+++ b/bootstrap/helpers/docker.php
@@ -325,38 +325,16 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
     $labels->push('traefik.http.middlewares.gzip.compress=true');
     $labels->push('traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https');
 
-    $basic_auth = false;
-    $basic_auth_middleware = null;
-    $redirect = false;
-    $redirect_middleware = null;
+    $middlewares_from_labels = collect([]);
 
     if ($serviceLabels) {
-        $basic_auth = $serviceLabels->contains(function ($value) {
-            return str_contains($value, 'basicauth');
-        });
-        if ($basic_auth) {
-            $basic_auth_middleware = $serviceLabels
-                ->map(function ($item) {
-                    if (preg_match('/traefik\.http\.middlewares\.(.*?)\.basicauth\.users/', $item, $matches)) {
-                        return $matches[1];
-                    }
-                })
-                ->filter()
-                ->first();
-        }
-        $redirect = $serviceLabels->contains(function ($value) {
-            return str_contains($value, 'redirectregex');
-        });
-        if ($redirect) {
-            $redirect_middleware = $serviceLabels
-                ->map(function ($item) {
-                    if (preg_match('/traefik\.http\.middlewares\.(.*?)\.redirectregex\.regex/', $item, $matches)) {
-                        return $matches[1];
-                    }
-                })
-                ->filter()
-                ->first();
-        }
+        $middlewares_from_labels = $serviceLabels->map(function ($item) {
+            if (preg_match('/traefik\.http\.middlewares\.(.*?)(\.|$)/', $item, $matches)) {
+                return $matches[1];
+            }
+            return null;
+        })->filter()
+        ->unique();
     }
     foreach ($domains as $loop => $domain) {
         try {
@@ -404,20 +382,15 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
                     $labels->push("traefik.http.services.{$https_label}.loadbalancer.server.port=$port");
                 }
                 if ($path !== '/') {
+                    // Middleware handling
                     $middlewares = collect([]);
-                    if ($is_stripprefix_enabled && ! str($image)->contains('ghost')) {
+                    if ($is_stripprefix_enabled && !str($image)->contains('ghost')) {
                         $labels->push("traefik.http.middlewares.{$https_label}-stripprefix.stripprefix.prefixes={$path}");
                         $middlewares->push("{$https_label}-stripprefix");
                     }
                     if ($is_gzip_enabled) {
                         $middlewares->push('gzip');
                     }
-                    if ($basic_auth && $basic_auth_middleware) {
-                        $middlewares->push($basic_auth_middleware);
-                    }
-                    if ($redirect && $redirect_middleware) {
-                        $middlewares->push($redirect_middleware);
-                    }
                     if (str($image)->contains('ghost')) {
                         $middlewares->push('redir-ghost');
                     }
@@ -425,10 +398,13 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
                         $labels = $labels->merge($redirect_to_non_www);
                         $middlewares->push($to_non_www_name);
                     }
-                    if ($redirect_direction === 'www' && ! str($host)->startsWith('www.')) {
+                    if ($redirect_direction === 'www' && !str($host)->startsWith('www.')) {
                         $labels = $labels->merge($redirect_to_www);
                         $middlewares->push($to_www_name);
                     }
+                    $middlewares_from_labels->each(function ($middleware_name) use ($middlewares) {
+                        $middlewares->push($middleware_name);
+                    });
                     if ($middlewares->isNotEmpty()) {
                         $middlewares = $middlewares->join(',');
                         $labels->push("traefik.http.routers.{$https_label}.middlewares={$middlewares}");
@@ -437,13 +413,7 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
                     $middlewares = collect([]);
                     if ($is_gzip_enabled) {
                         $middlewares->push('gzip');
-                    }
-                    if ($basic_auth && $basic_auth_middleware) {
-                        $middlewares->push($basic_auth_middleware);
-                    }
-                    if ($redirect && $redirect_middleware) {
-                        $middlewares->push($redirect_middleware);
-                    }
+                    }                   
                     if (str($image)->contains('ghost')) {
                         $middlewares->push('redir-ghost');
                     }
@@ -455,6 +425,9 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
                         $labels = $labels->merge($redirect_to_www);
                         $middlewares->push($to_www_name);
                     }
+                    $middlewares_from_labels->each(function ($middleware_name) use ($middlewares) {
+                        $middlewares->push($middleware_name);
+                    });
                     if ($middlewares->isNotEmpty()) {
                         $middlewares = $middlewares->join(',');
                         $labels->push("traefik.http.routers.{$https_label}.middlewares={$middlewares}");
@@ -490,12 +463,6 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
                     if ($is_gzip_enabled) {
                         $middlewares->push('gzip');
                     }
-                    if ($basic_auth && $basic_auth_middleware) {
-                        $middlewares->push($basic_auth_middleware);
-                    }
-                    if ($redirect && $redirect_middleware) {
-                        $middlewares->push($redirect_middleware);
-                    }
                     if (str($image)->contains('ghost')) {
                         $middlewares->push('redir-ghost');
                     }
@@ -507,6 +474,9 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
                         $labels = $labels->merge($redirect_to_www);
                         $middlewares->push($to_www_name);
                     }
+                    $middlewares_from_labels->each(function ($middleware_name) use ($middlewares) {
+                        $middlewares->push($middleware_name);
+                    });
                     if ($middlewares->isNotEmpty()) {
                         $middlewares = $middlewares->join(',');
                         $labels->push("traefik.http.routers.{$http_label}.middlewares={$middlewares}");
@@ -516,12 +486,6 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
                     if ($is_gzip_enabled) {
                         $middlewares->push('gzip');
                     }
-                    if ($basic_auth && $basic_auth_middleware) {
-                        $middlewares->push($basic_auth_middleware);
-                    }
-                    if ($redirect && $redirect_middleware) {
-                        $middlewares->push($redirect_middleware);
-                    }
                     if (str($image)->contains('ghost')) {
                         $middlewares->push('redir-ghost');
                     }
@@ -533,6 +497,9 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
                         $labels = $labels->merge($redirect_to_www);
                         $middlewares->push($to_www_name);
                     }
+                    $middlewares_from_labels->each(function ($middleware_name) use ($middlewares) {
+                        $middlewares->push($middleware_name);
+                    });
                     if ($middlewares->isNotEmpty()) {
                         $middlewares = $middlewares->join(',');
                         $labels->push("traefik.http.routers.{$http_label}.middlewares={$middlewares}");