An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.
PHP coolifydatabasesdeploymentdockerdocker-composeinertiajslaravelmariadbmysqlnextjsnodejsphppostgresredisself-hostedself-hostingserverstatic-sitesveltesvelte5
refactor: simplify remote process chain and harden ActivityMonitor
Andras Bacsai3e0d48faeaab
diff --git a/CLAUDE.md b/CLAUDE.mdindex 99e9967563..bb65da4056 100644--- a/CLAUDE.md+++ b/CLAUDE.md@@ -43,7 +43,7 @@ npm run build # production build- **Models/** — Eloquent models extending `BaseModel` which provides auto-CUID2 UUID generation. Key models: `Server`, `Application`, `Service`, `Project`, `Environment`, `Team`, plus standalone database models (`StandalonePostgresql`, `StandaloneMysql`, etc.). Common traits: `HasConfiguration`, `HasMetrics`, `HasSafeStringAttribute`, `ClearsGlobalSearchCache`.- **Services/** — Business logic services (ConfigurationGenerator, DockerImageParser, ContainerStatusAggregator, HetznerService, etc.). Use Services for complex orchestration; use Actions for single-purpose domain operations.- **Helpers/** — Global helpers loaded via `bootstrap/includeHelpers.php` from `bootstrap/helpers/` — organized into `shared.php`, `constants.php`, `versions.php`, `subscriptions.php`, `domains.php`, `docker.php`, `services.php`, `github.php`, `proxy.php`, `notifications.php`.-- **Data/** — Spatie Laravel Data DTOs (e.g., `CoolifyTaskArgs`, `ServerMetadata`).+- **Data/** — Spatie Laravel Data DTOs (e.g., `ServerMetadata`).- **Enums/** — PHP enums (TitleCase keys). Key enums: `ProcessStatus`, `Role` (MEMBER/ADMIN/OWNER with rank comparison), `BuildPackTypes`, `ProxyTypes`, `ContainerStatusTypes`.- **Rules/** — Custom validation rules (`ValidGitRepositoryUrl`, `ValidServerIp`, `ValidHostname`, `DockerImageFormat`, etc.).diff --git a/app/Actions/CoolifyTask/PrepareCoolifyTask.php b/app/Actions/CoolifyTask/PrepareCoolifyTask.phpdeleted file mode 100644index 3f76a2e3c7..0000000000--- a/app/Actions/CoolifyTask/PrepareCoolifyTask.php+++ /dev/null@@ -1,54 +0,0 @@-<?php--namespace App\Actions\CoolifyTask;--use App\Data\CoolifyTaskArgs;-use App\Jobs\CoolifyTask;-use Spatie\Activitylog\Models\Activity;--/**- * The initial step to run a `CoolifyTask`: a remote SSH process- * with monitoring/tracking/trace feature. Such thing is made- * possible using an Activity model and some attributes.- */-class PrepareCoolifyTask-{- protected Activity $activity;-- protected CoolifyTaskArgs $remoteProcessArgs;-- public function __construct(CoolifyTaskArgs $remoteProcessArgs)- {- $this->remoteProcessArgs = $remoteProcessArgs;-- if ($remoteProcessArgs->model) {- $properties = $remoteProcessArgs->toArray();- unset($properties['model']);-- $this->activity = activity()- ->withProperties($properties)- ->performedOn($remoteProcessArgs->model)- ->event($remoteProcessArgs->type)- ->log('[]');- } else {- $this->activity = activity()- ->withProperties($remoteProcessArgs->toArray())- ->event($remoteProcessArgs->type)- ->log('[]');- }- }-- public function __invoke(): Activity- {- $job = new CoolifyTask(- activity: $this->activity,- ignore_errors: $this->remoteProcessArgs->ignore_errors,- call_event_on_finish: $this->remoteProcessArgs->call_event_on_finish,- call_event_data: $this->remoteProcessArgs->call_event_data,- );- dispatch($job);- $this->activity->refresh();-- return $this->activity;- }-}diff --git a/app/Data/CoolifyTaskArgs.php b/app/Data/CoolifyTaskArgs.phpdeleted file mode 100644index 24132157ad..0000000000--- a/app/Data/CoolifyTaskArgs.php+++ /dev/null@@ -1,30 +0,0 @@-<?php--namespace App\Data;--use App\Enums\ProcessStatus;-use Illuminate\Database\Eloquent\Model;-use Spatie\LaravelData\Data;--/**- * The parameters to execute a CoolifyTask, organized in a DTO.- */-class CoolifyTaskArgs extends Data-{- public function __construct(- public string $server_uuid,- public string $command,- public string $type,- public ?string $type_uuid = null,- public ?int $process_id = null,- public ?Model $model = null,- public ?string $status = null,- public bool $ignore_errors = false,- public $call_event_on_finish = null,- public $call_event_data = null- ) {- if (is_null($status)) {- $this->status = ProcessStatus::QUEUED->value;- }- }-}diff --git a/app/Livewire/ActivityMonitor.php b/app/Livewire/ActivityMonitor.phpindex 85ba60c338..665d14ba0e 100644--- a/app/Livewire/ActivityMonitor.php+++ b/app/Livewire/ActivityMonitor.php@@ -2,7 +2,9 @@namespace App\Livewire;+use App\Models\Server;use App\Models\User;+use Livewire\Attributes\Locked;use Livewire\Component;use Spatie\Activitylog\Models\Activity;@@ -10,6 +12,7 @@ class ActivityMonitor extends Component{public ?string $header = null;+ #[Locked]public $activityId = null;public $eventToDispatch = 'activityFinished';@@ -57,25 +60,47 @@ class ActivityMonitor extends Component$activity = Activity::find($this->activityId);- if ($activity) {- $teamId = data_get($activity, 'properties.team_id');- if ($teamId && $teamId !== currentTeam()?->id) {+ if (! $activity) {+ $this->activity = null;++ return;+ }++ $currentTeamId = currentTeam()?->id;++ // Check team_id stored directly in activity properties+ $activityTeamId = data_get($activity, 'properties.team_id');+ if ($activityTeamId !== null) {+ if ((int) $activityTeamId !== (int) $currentTeamId) {$this->activity = null;return;}++ $this->activity = $activity;++ return;}- $this->activity = $activity;- }+ // Fallback: verify ownership via the server that ran the command+ $serverUuid = data_get($activity, 'properties.server_uuid');+ if ($serverUuid) {+ $server = Server::where('uuid', $serverUuid)->first();+ if ($server && (int) $server->team_id !== (int) $currentTeamId) {+ $this->activity = null;- public function updatedActivityId($value)- {- if ($value) {- $this->hydrateActivity();- $this->isPollingActive = true;- self::$eventDispatched = false;+ return;+ }++ if ($server) {+ $this->activity = $activity;++ return;+ }}++ // Fail closed: no team_id and no server_uuid means we cannot verify ownership+ $this->activity = null;}public function polling()diff --git a/bootstrap/helpers/remoteProcess.php b/bootstrap/helpers/remoteProcess.phpindex f819df380e..2544719fca 100644--- a/bootstrap/helpers/remoteProcess.php+++ b/bootstrap/helpers/remoteProcess.php@@ -1,9 +1,10 @@<?php-use App\Actions\CoolifyTask\PrepareCoolifyTask;-use App\Data\CoolifyTaskArgs;use App\Enums\ActivityTypes;+use App\Enums\ProcessStatus;use App\Helpers\SshMultiplexingHelper;+use App\Helpers\SshRetryHandler;+use App\Jobs\CoolifyTask;use App\Models\Application;use App\Models\ApplicationDeploymentQueue;use App\Models\PrivateKey;@@ -38,29 +39,46 @@ function remote_process(if (Auth::check()) {$teams = Auth::user()->teams->pluck('id');if (! $teams->contains($server->team_id) && ! $teams->contains(0)) {- throw new \Exception('User is not part of the team that owns this server');+ throw new Exception('User is not part of the team that owns this server');}}SshMultiplexingHelper::ensureMultiplexedConnection($server);- return resolve(PrepareCoolifyTask::class, [- 'remoteProcessArgs' => new CoolifyTaskArgs(- server_uuid: $server->uuid,- command: $command_string,- type: $type,- type_uuid: $type_uuid,- model: $model,- ignore_errors: $ignore_errors,- call_event_on_finish: $callEventOnFinish,- call_event_data: $callEventData,- ),- ])();+ $properties = [+ 'server_uuid' => $server->uuid,+ 'command' => $command_string,+ 'type' => $type,+ 'type_uuid' => $type_uuid,+ 'status' => ProcessStatus::QUEUED->value,+ 'team_id' => $server->team_id,+ ];++ $activityLog = activity()+ ->withProperties($properties)+ ->event($type);++ if ($model) {+ $activityLog->performedOn($model);+ }++ $activity = $activityLog->log('[]');++ dispatch(new CoolifyTask(+ activity: $activity,+ ignore_errors: $ignore_errors,+ call_event_on_finish: $callEventOnFinish,+ call_event_data: $callEventData,+ ));++ $activity->refresh();++ return $activity;}function instant_scp(string $source, string $dest, Server $server, $throwError = true){- return \App\Helpers\SshRetryHandler::retry(+ return SshRetryHandler::retry(function () use ($source, $dest, $server) {$scp_command = SshMultiplexingHelper::generateScpCommand($server, $source, $dest);$process = Process::timeout(config('constants.ssh.command_timeout'))->run($scp_command);@@ -92,7 +110,7 @@ function instant_remote_process_with_timeout(Collection|array $command, Server $}$command_string = implode("\n", $command);- return \App\Helpers\SshRetryHandler::retry(+ return SshRetryHandler::retry(function () use ($server, $command_string) {$sshCommand = SshMultiplexingHelper::generateSshCommand($server, $command_string);$process = Process::timeout(30)->run($sshCommand);@@ -128,7 +146,7 @@ function instant_remote_process(Collection|array $command, Server $server, bool$command_string = implode("\n", $command);$effectiveTimeout = $timeout ?? config('constants.ssh.command_timeout');- return \App\Helpers\SshRetryHandler::retry(+ return SshRetryHandler::retry(function () use ($server, $command_string, $effectiveTimeout, $disableMultiplexing) {$sshCommand = SshMultiplexingHelper::generateSshCommand($server, $command_string, $disableMultiplexing);$process = Process::timeout($effectiveTimeout)->run($sshCommand);@@ -170,9 +188,9 @@ function excludeCertainErrors(string $errorOutput, ?int $exitCode = null)if ($ignored) {// TODO: Create new exception and disable in sentry- throw new \RuntimeException($errorMessage, $exitCode);+ throw new RuntimeException($errorMessage, $exitCode);}- throw new \RuntimeException($errorMessage, $exitCode);+ throw new RuntimeException($errorMessage, $exitCode);}function decode_remote_command_output(?ApplicationDeploymentQueue $application_deployment_queue = null, bool $includeAll = false): Collection@@ -194,7 +212,7 @@ function decode_remote_command_output(?ApplicationDeploymentQueue $application_dassociative: true,flags: JSON_THROW_ON_ERROR);- } catch (\JsonException $e) {+ } catch (JsonException $e) {// If JSON decoding fails, try to clean up the logs and retrytry {// Ensure valid UTF-8 encoding@@ -204,7 +222,7 @@ function decode_remote_command_output(?ApplicationDeploymentQueue $application_dassociative: true,flags: JSON_THROW_ON_ERROR);- } catch (\JsonException $e) {+ } catch (JsonException $e) {// If it still fails, return empty collection to prevent crashesreturn collect([]);}@@ -353,7 +371,7 @@ function checkRequiredCommands(Server $server)}try {instant_remote_process(["docker run --rm --privileged --net=host --pid=host --ipc=host --volume /:/host busybox chroot /host bash -c 'apt update && apt install -y {$command}'"], $server);- } catch (\Throwable) {+ } catch (Throwable) {break;}$commandFound = instant_remote_process(["docker run --rm --privileged --net=host --pid=host --ipc=host --volume /:/host busybox chroot /host bash -c 'command -v {$command}'"], $server, false);diff --git a/resources/views/livewire/activity-monitor.blade.php b/resources/views/livewire/activity-monitor.blade.phpindex 386d8622de..290a918577 100644--- a/resources/views/livewire/activity-monitor.blade.php+++ b/resources/views/livewire/activity-monitor.blade.php@@ -34,10 +34,10 @@}}" x-init="// Initial scroll$nextTick(() => scrollToBottom());-+// Add scroll event listener$el.addEventListener('scroll', () => handleScroll());-+// Set up mutation observer to watch for content changesobserver = new MutationObserver(() => {$nextTick(() => scrollToBottom());diff --git a/tests/Feature/ActivityMonitorCrossTeamTest.php b/tests/Feature/ActivityMonitorCrossTeamTest.phpindex 7e4aebc2f6..9966ac2ddc 100644--- a/tests/Feature/ActivityMonitorCrossTeamTest.php+++ b/tests/Feature/ActivityMonitorCrossTeamTest.php@@ -1,9 +1,11 @@<?phpuse App\Livewire\ActivityMonitor;+use App\Models\Server;use App\Models\Team;use App\Models\User;use Illuminate\Foundation\Testing\RefreshDatabase;+use Livewire\Exceptions\CannotUpdateLockedPropertyException;use Livewire\Livewire;use Spatie\Activitylog\Models\Activity;@@ -17,7 +19,7 @@ beforeEach(function () {$this->otherTeam = Team::factory()->create();});-test('hydrateActivity blocks access to another teams activity', function () {+test('hydrateActivity blocks access to another teams activity via team_id', function () {$otherActivity = Activity::create(['log_name' => 'default','description' => 'test activity',@@ -27,12 +29,12 @@ test('hydrateActivity blocks access to another teams activity', function () {$this->actingAs($this->user);session(['currentTeam' => ['id' => $this->team->id]]);- $component = Livewire::test(ActivityMonitor::class)- ->set('activityId', $otherActivity->id)+ Livewire::test(ActivityMonitor::class)+ ->call('newMonitorActivity', $otherActivity->id)->assertSet('activity', null);});-test('hydrateActivity allows access to own teams activity', function () {+test('hydrateActivity allows access to own teams activity via team_id', function () {$ownActivity = Activity::create(['log_name' => 'default','description' => 'test activity',@@ -43,13 +45,13 @@ test('hydrateActivity allows access to own teams activity', function () {session(['currentTeam' => ['id' => $this->team->id]]);$component = Livewire::test(ActivityMonitor::class)- ->set('activityId', $ownActivity->id);+ ->call('newMonitorActivity', $ownActivity->id);expect($component->get('activity'))->not->toBeNull();expect($component->get('activity')->id)->toBe($ownActivity->id);});-test('hydrateActivity allows access to activity without team_id in properties', function () {+test('hydrateActivity blocks access to activity without team_id or server_uuid', function () {$legacyActivity = Activity::create(['log_name' => 'default','description' => 'legacy activity',@@ -59,9 +61,72 @@ test('hydrateActivity allows access to activity without team_id in properties',$this->actingAs($this->user);session(['currentTeam' => ['id' => $this->team->id]]);+ Livewire::test(ActivityMonitor::class)+ ->call('newMonitorActivity', $legacyActivity->id)+ ->assertSet('activity', null);+});++test('hydrateActivity blocks access to activity from another teams server via server_uuid', function () {+ $otherServer = Server::factory()->create([+ 'team_id' => $this->otherTeam->id,+ ]);++ $otherActivity = Activity::create([+ 'log_name' => 'default',+ 'description' => 'test activity',+ 'properties' => ['server_uuid' => $otherServer->uuid],+ ]);++ $this->actingAs($this->user);+ session(['currentTeam' => ['id' => $this->team->id]]);++ Livewire::test(ActivityMonitor::class)+ ->call('newMonitorActivity', $otherActivity->id)+ ->assertSet('activity', null);+});++test('hydrateActivity allows access to activity from own teams server via server_uuid', function () {+ $ownServer = Server::factory()->create([+ 'team_id' => $this->team->id,+ ]);++ $ownActivity = Activity::create([+ 'log_name' => 'default',+ 'description' => 'test activity',+ 'properties' => ['server_uuid' => $ownServer->uuid],+ ]);++ $this->actingAs($this->user);+ session(['currentTeam' => ['id' => $this->team->id]]);+$component = Livewire::test(ActivityMonitor::class)- ->set('activityId', $legacyActivity->id);+ ->call('newMonitorActivity', $ownActivity->id);expect($component->get('activity'))->not->toBeNull();- expect($component->get('activity')->id)->toBe($legacyActivity->id);+ expect($component->get('activity')->id)->toBe($ownActivity->id);+});++test('hydrateActivity returns null for non-existent activity id', function () {+ $this->actingAs($this->user);+ session(['currentTeam' => ['id' => $this->team->id]]);++ Livewire::test(ActivityMonitor::class)+ ->call('newMonitorActivity', 99999)+ ->assertSet('activity', null);});++test('activityId property is locked and cannot be set from client', function () {+ $otherActivity = Activity::create([+ 'log_name' => 'default',+ 'description' => 'test activity',+ 'properties' => ['team_id' => $this->otherTeam->id],+ ]);++ $this->actingAs($this->user);+ session(['currentTeam' => ['id' => $this->team->id]]);++ // Attempting to set a #[Locked] property from the client should throw+ Livewire::test(ActivityMonitor::class)+ ->set('activityId', $otherActivity->id)+ ->assertStatus(500);+})->throws(CannotUpdateLockedPropertyException::class);