From 158d54712f4ed212750f0b1da6d98d761bd97454 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Tue, 2 Dec 2025 13:36:32 +0100
Subject: [PATCH 1/2] Remove webhook maintenance mode replay feature
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This feature stored incoming webhooks during maintenance mode and replayed them
when maintenance ended. The behavior adds unnecessary complexity without clear
value. Standard approach is to let webhooks fail during maintenance and let
senders retry.

Removes:
- Listener classes that handled maintenance mode events and webhook replay
- Maintenance mode checks from all webhook controllers (Github, Gitea, Gitlab, Bitbucket, Stripe)
- webhooks-during-maintenance filesystem disk configuration
- Feature mention from CHANGELOG

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 CHANGELOG.md                                  |  1 -
 app/Http/Controllers/Webhook/Bitbucket.php    | 18 -----
 app/Http/Controllers/Webhook/Gitea.php        | 25 -------
 app/Http/Controllers/Webhook/Github.php       | 66 -------------------
 app/Http/Controllers/Webhook/Gitlab.php       | 19 ------
 app/Http/Controllers/Webhook/Stripe.php       | 18 -----
 .../MaintenanceModeDisabledNotification.php   | 48 --------------
 .../MaintenanceModeEnabledNotification.php    | 21 ------
 app/Providers/EventServiceProvider.php        | 10 ---
 config/filesystems.php                        |  7 --
 10 files changed, 233 deletions(-)
 delete mode 100644 app/Listeners/MaintenanceModeDisabledNotification.php
 delete mode 100644 app/Listeners/MaintenanceModeEnabledNotification.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2980c7401..5660f2569 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5389,7 +5389,6 @@ ### 🚀 Features
 - Add static ipv4 ipv6 support
 - Server disabled by overflow
 - Preview deployment logs
-- Collect webhooks during maintenance
 - Logs and execute commands with several servers
 
 ### 🐛 Bug Fixes
diff --git a/app/Http/Controllers/Webhook/Bitbucket.php b/app/Http/Controllers/Webhook/Bitbucket.php
index 078494f82..2f228119d 100644
--- a/app/Http/Controllers/Webhook/Bitbucket.php
+++ b/app/Http/Controllers/Webhook/Bitbucket.php
@@ -3,7 +3,6 @@
 namespace App\Http\Controllers\Webhook;
 
 use App\Http\Controllers\Controller;
-use App\Livewire\Project\Service\Storage;
 use App\Models\Application;
 use App\Models\ApplicationPreview;
 use Exception;
@@ -15,23 +14,6 @@ class Bitbucket extends Controller
     public function manual(Request $request)
     {
         try {
-            if (app()->isDownForMaintenance()) {
-                $epoch = now()->valueOf();
-                $data = [
-                    'attributes' => $request->attributes->all(),
-                    'request' => $request->request->all(),
-                    'query' => $request->query->all(),
-                    'server' => $request->server->all(),
-                    'files' => $request->files->all(),
-                    'cookies' => $request->cookies->all(),
-                    'headers' => $request->headers->all(),
-                    'content' => $request->getContent(),
-                ];
-                $json = json_encode($data);
-                Storage::disk('webhooks-during-maintenance')->put("{$epoch}_Bitbicket::manual_bitbucket", $json);
-
-                return;
-            }
             $return_payloads = collect([]);
             $payload = $request->collect();
             $headers = $request->headers->all();
diff --git a/app/Http/Controllers/Webhook/Gitea.php b/app/Http/Controllers/Webhook/Gitea.php
index 3e0c5a0b6..e41825aba 100644
--- a/app/Http/Controllers/Webhook/Gitea.php
+++ b/app/Http/Controllers/Webhook/Gitea.php
@@ -7,7 +7,6 @@
 use App\Models\ApplicationPreview;
 use Exception;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use Visus\Cuid2\Cuid2;
 
@@ -18,30 +17,6 @@ public function manual(Request $request)
         try {
             $return_payloads = collect([]);
             $x_gitea_delivery = request()->header('X-Gitea-Delivery');
-            if (app()->isDownForMaintenance()) {
-                $epoch = now()->valueOf();
-                $files = Storage::disk('webhooks-during-maintenance')->files();
-                $gitea_delivery_found = collect($files)->filter(function ($file) use ($x_gitea_delivery) {
-                    return Str::contains($file, $x_gitea_delivery);
-                })->first();
-                if ($gitea_delivery_found) {
-                    return;
-                }
-                $data = [
-                    'attributes' => $request->attributes->all(),
-                    'request' => $request->request->all(),
-                    'query' => $request->query->all(),
-                    'server' => $request->server->all(),
-                    'files' => $request->files->all(),
-                    'cookies' => $request->cookies->all(),
-                    'headers' => $request->headers->all(),
-                    'content' => $request->getContent(),
-                ];
-                $json = json_encode($data);
-                Storage::disk('webhooks-during-maintenance')->put("{$epoch}_Gitea::manual_{$x_gitea_delivery}", $json);
-
-                return;
-            }
             $x_gitea_event = Str::lower($request->header('X-Gitea-Event'));
             $x_hub_signature_256 = Str::after($request->header('X-Hub-Signature-256'), 'sha256=');
             $content_type = $request->header('Content-Type');
diff --git a/app/Http/Controllers/Webhook/Github.php b/app/Http/Controllers/Webhook/Github.php
index a1fcaa7f5..2402b71ae 100644
--- a/app/Http/Controllers/Webhook/Github.php
+++ b/app/Http/Controllers/Webhook/Github.php
@@ -14,7 +14,6 @@
 use Exception;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use Visus\Cuid2\Cuid2;
 
@@ -25,30 +24,6 @@ public function manual(Request $request)
         try {
             $return_payloads = collect([]);
             $x_github_delivery = request()->header('X-GitHub-Delivery');
-            if (app()->isDownForMaintenance()) {
-                $epoch = now()->valueOf();
-                $files = Storage::disk('webhooks-during-maintenance')->files();
-                $github_delivery_found = collect($files)->filter(function ($file) use ($x_github_delivery) {
-                    return Str::contains($file, $x_github_delivery);
-                })->first();
-                if ($github_delivery_found) {
-                    return;
-                }
-                $data = [
-                    'attributes' => $request->attributes->all(),
-                    'request' => $request->request->all(),
-                    'query' => $request->query->all(),
-                    'server' => $request->server->all(),
-                    'files' => $request->files->all(),
-                    'cookies' => $request->cookies->all(),
-                    'headers' => $request->headers->all(),
-                    'content' => $request->getContent(),
-                ];
-                $json = json_encode($data);
-                Storage::disk('webhooks-during-maintenance')->put("{$epoch}_Github::manual_{$x_github_delivery}", $json);
-
-                return;
-            }
             $x_github_event = Str::lower($request->header('X-GitHub-Event'));
             $x_hub_signature_256 = Str::after($request->header('X-Hub-Signature-256'), 'sha256=');
             $content_type = $request->header('Content-Type');
@@ -310,30 +285,6 @@ public function normal(Request $request)
             $return_payloads = collect([]);
             $id = null;
             $x_github_delivery = $request->header('X-GitHub-Delivery');
-            if (app()->isDownForMaintenance()) {
-                $epoch = now()->valueOf();
-                $files = Storage::disk('webhooks-during-maintenance')->files();
-                $github_delivery_found = collect($files)->filter(function ($file) use ($x_github_delivery) {
-                    return Str::contains($file, $x_github_delivery);
-                })->first();
-                if ($github_delivery_found) {
-                    return;
-                }
-                $data = [
-                    'attributes' => $request->attributes->all(),
-                    'request' => $request->request->all(),
-                    'query' => $request->query->all(),
-                    'server' => $request->server->all(),
-                    'files' => $request->files->all(),
-                    'cookies' => $request->cookies->all(),
-                    'headers' => $request->headers->all(),
-                    'content' => $request->getContent(),
-                ];
-                $json = json_encode($data);
-                Storage::disk('webhooks-during-maintenance')->put("{$epoch}_Github::normal_{$x_github_delivery}", $json);
-
-                return;
-            }
             $x_github_event = Str::lower($request->header('X-GitHub-Event'));
             $x_github_hook_installation_target_id = $request->header('X-GitHub-Hook-Installation-Target-Id');
             $x_hub_signature_256 = Str::after($request->header('X-Hub-Signature-256'), 'sha256=');
@@ -624,23 +575,6 @@ public function install(Request $request)
     {
         try {
             $installation_id = $request->get('installation_id');
-            if (app()->isDownForMaintenance()) {
-                $epoch = now()->valueOf();
-                $data = [
-                    'attributes' => $request->attributes->all(),
-                    'request' => $request->request->all(),
-                    'query' => $request->query->all(),
-                    'server' => $request->server->all(),
-                    'files' => $request->files->all(),
-                    'cookies' => $request->cookies->all(),
-                    'headers' => $request->headers->all(),
-                    'content' => $request->getContent(),
-                ];
-                $json = json_encode($data);
-                Storage::disk('webhooks-during-maintenance')->put("{$epoch}_Github::install_{$installation_id}", $json);
-
-                return;
-            }
             $source = $request->get('source');
             $setup_action = $request->get('setup_action');
             $github_app = GithubApp::where('uuid', $source)->firstOrFail();
diff --git a/app/Http/Controllers/Webhook/Gitlab.php b/app/Http/Controllers/Webhook/Gitlab.php
index 3187663d4..56a9c0d1b 100644
--- a/app/Http/Controllers/Webhook/Gitlab.php
+++ b/app/Http/Controllers/Webhook/Gitlab.php
@@ -7,7 +7,6 @@
 use App\Models\ApplicationPreview;
 use Exception;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use Visus\Cuid2\Cuid2;
 
@@ -16,24 +15,6 @@ class Gitlab extends Controller
     public function manual(Request $request)
     {
         try {
-            if (app()->isDownForMaintenance()) {
-                $epoch = now()->valueOf();
-                $data = [
-                    'attributes' => $request->attributes->all(),
-                    'request' => $request->request->all(),
-                    'query' => $request->query->all(),
-                    'server' => $request->server->all(),
-                    'files' => $request->files->all(),
-                    'cookies' => $request->cookies->all(),
-                    'headers' => $request->headers->all(),
-                    'content' => $request->getContent(),
-                ];
-                $json = json_encode($data);
-                Storage::disk('webhooks-during-maintenance')->put("{$epoch}_Gitlab::manual_gitlab", $json);
-
-                return;
-            }
-
             $return_payloads = collect([]);
             $payload = $request->collect();
             $headers = $request->headers->all();
diff --git a/app/Http/Controllers/Webhook/Stripe.php b/app/Http/Controllers/Webhook/Stripe.php
index ae50aac42..d59adf0ca 100644
--- a/app/Http/Controllers/Webhook/Stripe.php
+++ b/app/Http/Controllers/Webhook/Stripe.php
@@ -6,7 +6,6 @@
 use App\Jobs\StripeProcessJob;
 use Exception;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Storage;
 
 class Stripe extends Controller
 {
@@ -20,23 +19,6 @@ public function events(Request $request)
                 $signature,
                 $webhookSecret
             );
-            if (app()->isDownForMaintenance()) {
-                $epoch = now()->valueOf();
-                $data = [
-                    'attributes' => $request->attributes->all(),
-                    'request' => $request->request->all(),
-                    'query' => $request->query->all(),
-                    'server' => $request->server->all(),
-                    'files' => $request->files->all(),
-                    'cookies' => $request->cookies->all(),
-                    'headers' => $request->headers->all(),
-                    'content' => $request->getContent(),
-                ];
-                $json = json_encode($data);
-                Storage::disk('webhooks-during-maintenance')->put("{$epoch}_Stripe::events_stripe", $json);
-
-                return response('Webhook received. Cool cool cool cool cool.', 200);
-            }
             StripeProcessJob::dispatch($event);
 
             return response('Webhook received. Cool cool cool cool cool.', 200);
diff --git a/app/Listeners/MaintenanceModeDisabledNotification.php b/app/Listeners/MaintenanceModeDisabledNotification.php
deleted file mode 100644
index 6c3ab83d8..000000000
--- a/app/Listeners/MaintenanceModeDisabledNotification.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-namespace App\Listeners;
-
-use Illuminate\Foundation\Events\MaintenanceModeDisabled as EventsMaintenanceModeDisabled;
-use Illuminate\Support\Facades\Request;
-use Illuminate\Support\Facades\Storage;
-use Symfony\Component\HttpFoundation\Request as SymfonyRequest;
-
-class MaintenanceModeDisabledNotification
-{
-    public function __construct() {}
-
-    public function handle(EventsMaintenanceModeDisabled $event): void
-    {
-        $files = Storage::disk('webhooks-during-maintenance')->files();
-        $files = collect($files);
-        $files = $files->sort();
-        foreach ($files as $file) {
-            $content = Storage::disk('webhooks-during-maintenance')->get($file);
-            $data = json_decode($content, true);
-            $symfonyRequest = new SymfonyRequest(
-                $data['query'],
-                $data['request'],
-                $data['attributes'],
-                $data['cookies'],
-                $data['files'],
-                $data['server'],
-                $data['content']
-            );
-
-            foreach ($data['headers'] as $key => $value) {
-                $symfonyRequest->headers->set($key, $value);
-            }
-            $request = Request::createFromBase($symfonyRequest);
-            $endpoint = str($file)->after('_')->beforeLast('_')->value();
-            $class = "App\Http\Controllers\Webhook\\".ucfirst(str($endpoint)->before('::')->value());
-            $method = str($endpoint)->after('::')->value();
-            try {
-                $instance = new $class;
-                $instance->$method($request);
-            } catch (\Throwable $th) {
-            } finally {
-                Storage::disk('webhooks-during-maintenance')->delete($file);
-            }
-        }
-    }
-}
diff --git a/app/Listeners/MaintenanceModeEnabledNotification.php b/app/Listeners/MaintenanceModeEnabledNotification.php
deleted file mode 100644
index 5aab248ea..000000000
--- a/app/Listeners/MaintenanceModeEnabledNotification.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-namespace App\Listeners;
-
-use Illuminate\Foundation\Events\MaintenanceModeEnabled as EventsMaintenanceModeEnabled;
-
-class MaintenanceModeEnabledNotification
-{
-    /**
-     * Create the event listener.
-     */
-    public function __construct()
-    {
-        //
-    }
-
-    /**
-     * Handle the event.
-     */
-    public function handle(EventsMaintenanceModeEnabled $event): void {}
-}
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index 2d9910add..9163d595c 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -2,10 +2,6 @@
 
 namespace App\Providers;
 
-use App\Listeners\MaintenanceModeDisabledNotification;
-use App\Listeners\MaintenanceModeEnabledNotification;
-use Illuminate\Foundation\Events\MaintenanceModeDisabled;
-use Illuminate\Foundation\Events\MaintenanceModeEnabled;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
 use SocialiteProviders\Authentik\AuthentikExtendSocialite;
 use SocialiteProviders\Azure\AzureExtendSocialite;
@@ -19,12 +15,6 @@
 class EventServiceProvider extends ServiceProvider
 {
     protected $listen = [
-        MaintenanceModeEnabled::class => [
-            MaintenanceModeEnabledNotification::class,
-        ],
-        MaintenanceModeDisabled::class => [
-            MaintenanceModeDisabledNotification::class,
-        ],
         SocialiteWasCalled::class => [
             AzureExtendSocialite::class.'@handle',
             AuthentikExtendSocialite::class.'@handle',
diff --git a/config/filesystems.php b/config/filesystems.php
index c2df26c84..ba0921a79 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -35,13 +35,6 @@
             'throw' => false,
         ],
 
-        'webhooks-during-maintenance' => [
-            'driver' => 'local',
-            'root' => storage_path('app/webhooks-during-maintenance'),
-            'visibility' => 'private',
-            'throw' => false,
-        ],
-
         'public' => [
             'driver' => 'local',
             'root' => storage_path('app/public'),

From bf9f78538e083e39f3f413208105f95495e628fd Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Thu, 4 Dec 2025 14:55:07 +0100
Subject: [PATCH 2/2] Remove webhook maintenance directory from Docker
 configurations

---
 docker-compose.prod.yml                  |  1 -
 docker-compose.windows.yml               | 11 ++---------
 other/nightly/docker-compose.prod.yml    |  1 -
 other/nightly/docker-compose.windows.yml | 11 ++---------
 other/nightly/install.sh                 |  2 +-
 scripts/install.sh                       |  2 +-
 6 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index b90f126a2..46e0e88e5 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -11,7 +11,6 @@ services:
       - /data/coolify/databases:/var/www/html/storage/app/databases
       - /data/coolify/services:/var/www/html/storage/app/services
       - /data/coolify/backups:/var/www/html/storage/app/backups
-      - /data/coolify/webhooks-during-maintenance:/var/www/html/storage/app/webhooks-during-maintenance
     environment:
       - APP_ENV=${APP_ENV:-production}
       - PHP_MEMORY_LIMIT=${PHP_MEMORY_LIMIT:-256M}
diff --git a/docker-compose.windows.yml b/docker-compose.windows.yml
index cd4a307aa..3116a4185 100644
--- a/docker-compose.windows.yml
+++ b/docker-compose.windows.yml
@@ -25,7 +25,6 @@ services:
       - ./databases:/var/www/html/storage/app/databases
       - ./services:/var/www/html/storage/app/services
       - ./backups:/var/www/html/storage/app/backups
-      - ./webhooks-during-maintenance:/var/www/html/storage/app/webhooks-during-maintenance
     env_file:
       - .env
     environment:
@@ -75,13 +74,7 @@ services:
       POSTGRES_PASSWORD: "${DB_PASSWORD}"
       POSTGRES_DB: "${DB_DATABASE:-coolify}"
     healthcheck:
-      test:
-        [
-          "CMD-SHELL",
-          "pg_isready -U ${DB_USERNAME}",
-          "-d",
-          "${DB_DATABASE:-coolify}"
-        ]
+      test: [ "CMD-SHELL", "pg_isready -U ${DB_USERNAME}", "-d", "${DB_DATABASE:-coolify}" ]
       interval: 5s
       retries: 10
       timeout: 2s
@@ -121,7 +114,7 @@ services:
       SOKETI_DEFAULT_APP_KEY: "${PUSHER_APP_KEY}"
       SOKETI_DEFAULT_APP_SECRET: "${PUSHER_APP_SECRET}"
     healthcheck:
-      test: ["CMD-SHELL", "wget -qO- http://127.0.0.1:6001/ready && wget -qO- http://127.0.0.1:6002/ready || exit 1"]
+      test: [ "CMD-SHELL", "wget -qO- http://127.0.0.1:6001/ready && wget -qO- http://127.0.0.1:6002/ready || exit 1" ]
       interval: 5s
       retries: 10
       timeout: 2s
diff --git a/other/nightly/docker-compose.prod.yml b/other/nightly/docker-compose.prod.yml
index b90f126a2..46e0e88e5 100644
--- a/other/nightly/docker-compose.prod.yml
+++ b/other/nightly/docker-compose.prod.yml
@@ -11,7 +11,6 @@ services:
       - /data/coolify/databases:/var/www/html/storage/app/databases
       - /data/coolify/services:/var/www/html/storage/app/services
       - /data/coolify/backups:/var/www/html/storage/app/backups
-      - /data/coolify/webhooks-during-maintenance:/var/www/html/storage/app/webhooks-during-maintenance
     environment:
       - APP_ENV=${APP_ENV:-production}
       - PHP_MEMORY_LIMIT=${PHP_MEMORY_LIMIT:-256M}
diff --git a/other/nightly/docker-compose.windows.yml b/other/nightly/docker-compose.windows.yml
index 09ce3ead3..6306ab381 100644
--- a/other/nightly/docker-compose.windows.yml
+++ b/other/nightly/docker-compose.windows.yml
@@ -25,7 +25,6 @@ services:
       - ./databases:/var/www/html/storage/app/databases
       - ./services:/var/www/html/storage/app/services
       - ./backups:/var/www/html/storage/app/backups
-      - ./webhooks-during-maintenance:/var/www/html/storage/app/webhooks-during-maintenance
     env_file:
       - .env
     environment:
@@ -75,13 +74,7 @@ services:
       POSTGRES_PASSWORD: "${DB_PASSWORD}"
       POSTGRES_DB: "${DB_DATABASE:-coolify}"
     healthcheck:
-      test:
-        [
-          "CMD-SHELL",
-          "pg_isready -U ${DB_USERNAME}",
-          "-d",
-          "${DB_DATABASE:-coolify}"
-        ]
+      test: [ "CMD-SHELL", "pg_isready -U ${DB_USERNAME}", "-d", "${DB_DATABASE:-coolify}" ]
       interval: 5s
       retries: 10
       timeout: 2s
@@ -121,7 +114,7 @@ services:
       SOKETI_DEFAULT_APP_KEY: "${PUSHER_APP_KEY}"
       SOKETI_DEFAULT_APP_SECRET: "${PUSHER_APP_SECRET}"
     healthcheck:
-      test: ["CMD-SHELL", "wget -qO- http://127.0.0.1:6001/ready && wget -qO- http://127.0.0.1:6002/ready || exit 1"]
+      test: [ "CMD-SHELL", "wget -qO- http://127.0.0.1:6001/ready && wget -qO- http://127.0.0.1:6002/ready || exit 1" ]
       interval: 5s
       retries: 10
       timeout: 2s
diff --git a/other/nightly/install.sh b/other/nightly/install.sh
index ac4e3caff..b037fe382 100755
--- a/other/nightly/install.sh
+++ b/other/nightly/install.sh
@@ -223,7 +223,7 @@ if [ "$WARNING_SPACE" = true ]; then
     sleep 5
 fi
 
-mkdir -p /data/coolify/{source,ssh,applications,databases,backups,services,proxy,webhooks-during-maintenance,sentinel}
+mkdir -p /data/coolify/{source,ssh,applications,databases,backups,services,proxy,sentinel}
 mkdir -p /data/coolify/ssh/{keys,mux}
 mkdir -p /data/coolify/proxy/dynamic
 
diff --git a/scripts/install.sh b/scripts/install.sh
index c8b791185..c06b26eff 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -223,7 +223,7 @@ if [ "$WARNING_SPACE" = true ]; then
     sleep 5
 fi
 
-mkdir -p /data/coolify/{source,ssh,applications,databases,backups,services,proxy,webhooks-during-maintenance,sentinel}
+mkdir -p /data/coolify/{source,ssh,applications,databases,backups,services,proxy,sentinel}
 mkdir -p /data/coolify/ssh/{keys,mux}
 mkdir -p /data/coolify/proxy/dynamic