Merge remote-tracking branch 'origin/next' into fix/harden-getlogs-livewire-properties

app/Actions/Server/ValidateServer.php

@@ -30,7 +30,8 @@ class ValidateServer
         ]);
         ['uptime' => $this->uptime, 'error' => $error] = $server->validateConnection();
         if (! $this->uptime) {
-            $this->error = 'Server is not reachable. Please validate your configuration and connection.<br>Check this <a target="_blank" class="text-black underline dark:text-white" href="https://coolify.io/docs/knowledge-base/server/openssh">documentation</a> for further help. <br><br><div class="text-error">Error: '.$error.'</div>';
+            $sanitizedError = htmlspecialchars($error ?? '', ENT_QUOTES, 'UTF-8');
+            $this->error = 'Server is not reachable. Please validate your configuration and connection.<br>Check this <a target="_blank" class="text-black underline dark:text-white" href="https://coolify.io/docs/knowledge-base/server/openssh">documentation</a> for further help. <br><br><div class="text-error">Error: '.$sanitizedError.'</div>';
             $server->update([
                 'validation_logs' => $this->error,
             ]);

app/Actions/Stripe/UpdateSubscriptionQuantity.php

@@ -4,6 +4,7 @@ namespace App\Actions\Stripe;
 
 use App\Jobs\ServerLimitCheckJob;
 use App\Models\Team;
+use Stripe\Exception\InvalidRequestException;
 use Stripe\StripeClient;
 
 class UpdateSubscriptionQuantity
@@ -42,6 +43,7 @@ class UpdateSubscriptionQuantity
             }
 
             $currency = strtoupper($item->price->currency ?? 'usd');
+            $billingInterval = $item->price->recurring->interval ?? 'month';
 
             // Upcoming invoice gives us the prorated amount due now
             $upcomingInvoice = $this->stripe->invoices->upcoming([
@@ -99,6 +101,7 @@ class UpdateSubscriptionQuantity
                     'tax_description' => $taxDescription,
                     'quantity' => $quantity,
                     'currency' => $currency,
+                    'billing_interval' => $billingInterval,
                 ],
             ];
         } catch (\Exception $e) {
@@ -184,7 +187,7 @@ class UpdateSubscriptionQuantity
             \Log::info("Subscription {$subscription->stripe_subscription_id} quantity updated to {$quantity} for team {$team->name}");
 
             return ['success' => true, 'error' => null];
-        } catch (\Stripe\Exception\InvalidRequestException $e) {
+        } catch (InvalidRequestException $e) {
             \Log::error("Stripe update quantity error for team {$team->id}: ".$e->getMessage());
 
             return ['success' => false, 'error' => 'Stripe error: '.$e->getMessage()];

app/Console/Commands/Dev.php

@@ -30,32 +30,32 @@ class Dev extends Command
         // Generate APP_KEY if not exists
 
         if (empty(config('app.key'))) {
-            echo "Generating APP_KEY.\n";
+            echo "   INFO  Generating APP_KEY.\n";
             Artisan::call('key:generate');
         }
 
         // Generate STORAGE link if not exists
         if (! file_exists(public_path('storage'))) {
-            echo "Generating STORAGE link.\n";
+            echo "   INFO  Generating storage link.\n";
             Artisan::call('storage:link');
         }
 
         // Seed database if it's empty
         $settings = InstanceSettings::find(0);
         if (! $settings) {
-            echo "Initializing instance, seeding database.\n";
+            echo "   INFO  Initializing instance, seeding database.\n";
             Artisan::call('migrate --seed');
         } else {
-            echo "Instance already initialized.\n";
+            echo "   INFO  Instance already initialized.\n";
         }
 
         // Clean up stuck jobs and stale locks on development startup
         try {
-            echo "Cleaning up Redis (stuck jobs and stale locks)...\n";
+            echo "   INFO  Cleaning up Redis (stuck jobs and stale locks)...\n";
             Artisan::call('cleanup:redis', ['--restart' => true, '--clear-locks' => true]);
-            echo "Redis cleanup completed.\n";
+            echo "   INFO  Redis cleanup completed.\n";
         } catch (\Throwable $e) {
-            echo "Error in cleanup:redis: {$e->getMessage()}\n";
+            echo "   ERROR  Redis cleanup failed: {$e->getMessage()}\n";
         }
 
         try {
@@ -66,10 +66,10 @@ class Dev extends Command
             ]);
 
             if ($updatedTaskCount > 0) {
-                echo "Marked {$updatedTaskCount} stuck scheduled task executions as failed\n";
+                echo "   INFO  Marked {$updatedTaskCount} stuck scheduled task executions as failed.\n";
             }
         } catch (\Throwable $e) {
-            echo "Could not cleanup stuck scheduled task executions: {$e->getMessage()}\n";
+            echo "   ERROR  Could not clean up stuck scheduled task executions: {$e->getMessage()}\n";
         }
 
         try {
@@ -80,10 +80,10 @@ class Dev extends Command
             ]);
 
             if ($updatedBackupCount > 0) {
-                echo "Marked {$updatedBackupCount} stuck database backup executions as failed\n";
+                echo "   INFO  Marked {$updatedBackupCount} stuck database backup executions as failed.\n";
             }
         } catch (\Throwable $e) {
-            echo "Could not cleanup stuck database backup executions: {$e->getMessage()}\n";
+            echo "   ERROR  Could not clean up stuck database backup executions: {$e->getMessage()}\n";
         }
 
         CheckHelperImageJob::dispatch();

app/Console/Commands/Horizon.php

@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use Illuminate\Console\Command;
-
-class Horizon extends Command
-{
-    protected $signature = 'start:horizon';
-
-    protected $description = 'Start Horizon';
-
-    public function handle()
-    {
-        if (config('constants.horizon.is_horizon_enabled')) {
-            $this->info('Horizon is enabled on this server.');
-            $this->call('horizon');
-            exit(0);
-        } else {
-            exit(0);
-        }
-    }
-}

app/Console/Commands/Nightwatch.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use Illuminate\Console\Command;
-
-class Nightwatch extends Command
-{
-    protected $signature = 'start:nightwatch';
-
-    protected $description = 'Start Nightwatch';
-
-    public function handle(): void
-    {
-        if (config('constants.nightwatch.is_nightwatch_enabled')) {
-            $this->info('Nightwatch is enabled on this server.');
-            $this->call('nightwatch:agent');
-        }
-
-        exit(0);
-    }
-}

app/Console/Commands/Scheduler.php

@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use Illuminate\Console\Command;
-
-class Scheduler extends Command
-{
-    protected $signature = 'start:scheduler';
-
-    protected $description = 'Start Scheduler';
-
-    public function handle()
-    {
-        if (config('constants.horizon.is_scheduler_enabled')) {
-            $this->info('Scheduler is enabled on this server.');
-            $this->call('schedule:work');
-            exit(0);
-        } else {
-            exit(0);
-        }
-    }
-}

app/Jobs/ValidateAndInstallServerJob.php

@@ -45,7 +45,8 @@ class ValidateAndInstallServerJob implements ShouldBeEncrypted, ShouldQueue
             // Validate connection
             ['uptime' => $uptime, 'error' => $error] = $this->server->validateConnection();
             if (! $uptime) {
-                $errorMessage = 'Server is not reachable. Please validate your configuration and connection.<br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/knowledge-base/server/openssh">documentation</a> for further help. <br><br>Error: '.$error;
+                $sanitizedError = htmlspecialchars($error ?? '', ENT_QUOTES, 'UTF-8');
+                $errorMessage = 'Server is not reachable. Please validate your configuration and connection.<br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/knowledge-base/server/openssh">documentation</a> for further help. <br><br>Error: '.$sanitizedError;
                 $this->server->update([
                     'validation_logs' => $errorMessage,
                     'is_validating' => false,
@@ -197,7 +198,7 @@ class ValidateAndInstallServerJob implements ShouldBeEncrypted, ShouldQueue
             ]);
 
             $this->server->update([
-                'validation_logs' => 'An error occurred during validation: '.$e->getMessage(),
+                'validation_logs' => 'An error occurred during validation: '.htmlspecialchars($e->getMessage(), ENT_QUOTES, 'UTF-8'),
                 'is_validating' => false,
             ]);
         }

app/Livewire/Server/PrivateKey/Show.php

@@ -63,7 +63,8 @@ class Show extends Component
                 $this->dispatch('success', 'Server is reachable.');
                 $this->dispatch('refreshServerShow');
             } else {
-                $this->dispatch('error', 'Server is not reachable.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/knowledge-base/server/openssh">documentation</a> for further help.<br><br>Error: '.$error);
+                $sanitizedError = htmlspecialchars($error ?? '', ENT_QUOTES, 'UTF-8');
+                $this->dispatch('error', 'Server is not reachable.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/knowledge-base/server/openssh">documentation</a> for further help.<br><br>Error: '.$sanitizedError);
 
                 return;
             }

app/Livewire/Server/ValidateAndInstall.php

@@ -89,7 +89,8 @@ class ValidateAndInstall extends Component
         $this->authorize('update', $this->server);
         ['uptime' => $this->uptime, 'error' => $error] = $this->server->validateConnection();
         if (! $this->uptime) {
-            $this->error = 'Server is not reachable. Please validate your configuration and connection.<br>Check this <a target="_blank" class="text-black underline dark:text-white" href="https://coolify.io/docs/knowledge-base/server/openssh">documentation</a> for further help. <br><br><div class="text-error">Error: '.$error.'</div>';
+            $sanitizedError = htmlspecialchars($error ?? '', ENT_QUOTES, 'UTF-8');
+            $this->error = 'Server is not reachable. Please validate your configuration and connection.<br>Check this <a target="_blank" class="text-black underline dark:text-white" href="https://coolify.io/docs/knowledge-base/server/openssh">documentation</a> for further help. <br><br><div class="text-error">Error: '.$sanitizedError.'</div>';
             $this->server->update([
                 'validation_logs' => $this->error,
             ]);

app/Models/Server.php

@@ -267,6 +267,13 @@ class Server extends BaseModel
 
     use HasSafeStringAttribute;
 
+    public function setValidationLogsAttribute($value): void
+    {
+        $this->attributes['validation_logs'] = $value !== null
+            ? \Stevebauman\Purify\Facades\Purify::config('validation_logs')->clean($value)
+            : null;
+    }
+
     public function type()
     {
         return 'server';

app/Notifications/TransactionalEmails/ResetPassword.php

@@ -67,9 +67,12 @@ class ResetPassword extends Notification
             return call_user_func(static::$createUrlCallback, $notifiable, $this->token);
         }
 
-        return url(route('password.reset', [
+        $path = route('password.reset', [
             'token' => $this->token,
             'email' => $notifiable->getEmailForPasswordReset(),
-        ], false));
+        ], false);
+
+        // Use server-side config (FQDN / public IP) instead of request host
+        return rtrim(base_url(), '/').$path;
     }
 }