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
fix(api): validate server ownership in domains endpoint and scope activity lookups
Andras Bacsaia94517f452e2
diff --git a/app/Http/Controllers/Api/ServersController.php b/app/Http/Controllers/Api/ServersController.phpindex da94521a88..2ef95ce8b6 100644--- a/app/Http/Controllers/Api/ServersController.php+++ b/app/Http/Controllers/Api/ServersController.php@@ -290,7 +290,11 @@ class ServersController extends Controllerif (is_null($teamId)) {return invalidTokenResponse();}- $uuid = $request->get('uuid');+ $server = ModelsServer::whereTeamId($teamId)->whereUuid($request->uuid)->first();+ if (is_null($server)) {+ return response()->json(['message' => 'Server not found.'], 404);+ }+ $uuid = $request->query('uuid');if ($uuid) {$application = Application::ownedByCurrentTeamAPI($teamId)->where('uuid', $uuid)->first();if (! $application) {@@ -301,7 +305,9 @@ class ServersController extends Controller}$projects = Project::where('team_id', $teamId)->get();$domains = collect();- $applications = $projects->pluck('applications')->flatten();+ $applications = $projects->pluck('applications')->flatten()->filter(function ($application) use ($server) {+ return $application->destination?->server?->id === $server->id;+ });$settings = instanceSettings();if ($applications->count() > 0) {foreach ($applications as $application) {@@ -341,7 +347,9 @@ class ServersController extends Controller}}}- $services = $projects->pluck('services')->flatten();+ $services = $projects->pluck('services')->flatten()->filter(function ($service) use ($server) {+ return $service->server_id === $server->id;+ });if ($services->count() > 0) {foreach ($services as $service) {$service_applications = $service->applications;@@ -354,7 +362,8 @@ class ServersController extends Controller})->filter(function (Stringable $fqdn) {return $fqdn->isNotEmpty();});- if ($ip === 'host.docker.internal') {+ $serviceIp = $server->ip;+ if ($serviceIp === 'host.docker.internal') {if ($settings->public_ipv4) {$domains->push(['domain' => $fqdn,@@ -370,13 +379,13 @@ class ServersController extends Controllerif (! $settings->public_ipv4 && ! $settings->public_ipv6) {$domains->push(['domain' => $fqdn,- 'ip' => $ip,+ 'ip' => $serviceIp,]);}} else {$domains->push(['domain' => $fqdn,- 'ip' => $ip,+ 'ip' => $serviceIp,]);}}diff --git a/app/Livewire/ActivityMonitor.php b/app/Livewire/ActivityMonitor.phpindex 370ff1eaa1..85ba60c338 100644--- a/app/Livewire/ActivityMonitor.php+++ b/app/Livewire/ActivityMonitor.php@@ -55,7 +55,18 @@ class ActivityMonitor extends Componentreturn;}- $this->activity = Activity::find($this->activityId);+ $activity = Activity::find($this->activityId);++ if ($activity) {+ $teamId = data_get($activity, 'properties.team_id');+ if ($teamId && $teamId !== currentTeam()?->id) {+ $this->activity = null;++ return;+ }+ }++ $this->activity = $activity;}public function updatedActivityId($value)diff --git a/tests/Feature/ActivityMonitorCrossTeamTest.php b/tests/Feature/ActivityMonitorCrossTeamTest.phpnew file mode 100644index 0000000000..7e4aebc2f6--- /dev/null+++ b/tests/Feature/ActivityMonitorCrossTeamTest.php@@ -0,0 +1,67 @@+<?php++use App\Livewire\ActivityMonitor;+use App\Models\Team;+use App\Models\User;+use Illuminate\Foundation\Testing\RefreshDatabase;+use Livewire\Livewire;+use Spatie\Activitylog\Models\Activity;++uses(RefreshDatabase::class);++beforeEach(function () {+ $this->team = Team::factory()->create();+ $this->user = User::factory()->create();+ $this->team->members()->attach($this->user->id, ['role' => 'owner']);++ $this->otherTeam = Team::factory()->create();+});++test('hydrateActivity blocks access to another teams activity', 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]]);++ $component = Livewire::test(ActivityMonitor::class)+ ->set('activityId', $otherActivity->id)+ ->assertSet('activity', null);+});++test('hydrateActivity allows access to own teams activity', function () {+ $ownActivity = Activity::create([+ 'log_name' => 'default',+ 'description' => 'test activity',+ 'properties' => ['team_id' => $this->team->id],+ ]);++ $this->actingAs($this->user);+ session(['currentTeam' => ['id' => $this->team->id]]);++ $component = Livewire::test(ActivityMonitor::class)+ ->set('activityId', $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 () {+ $legacyActivity = Activity::create([+ 'log_name' => 'default',+ 'description' => 'legacy activity',+ 'properties' => [],+ ]);++ $this->actingAs($this->user);+ session(['currentTeam' => ['id' => $this->team->id]]);++ $component = Livewire::test(ActivityMonitor::class)+ ->set('activityId', $legacyActivity->id);++ expect($component->get('activity'))->not->toBeNull();+ expect($component->get('activity')->id)->toBe($legacyActivity->id);+});diff --git a/tests/Feature/DomainsByServerApiTest.php b/tests/Feature/DomainsByServerApiTest.phpindex 1e799bec55..ea799275b8 100644--- a/tests/Feature/DomainsByServerApiTest.php+++ b/tests/Feature/DomainsByServerApiTest.php@@ -16,11 +16,12 @@ beforeEach(function () {$this->user = User::factory()->create();$this->team->members()->attach($this->user->id, ['role' => 'owner']);- $this->token = $this->user->createToken('test-token', ['*'], $this->team->id);+ session(['currentTeam' => $this->team]);+ $this->token = $this->user->createToken('test-token', ['*']);$this->bearerToken = $this->token->plainTextToken;$this->server = Server::factory()->create(['team_id' => $this->team->id]);- $this->destination = StandaloneDocker::factory()->create(['server_id' => $this->server->id]);+ $this->destination = StandaloneDocker::where('server_id', $this->server->id)->first();$this->project = Project::factory()->create(['team_id' => $this->team->id]);$this->environment = Environment::factory()->create(['project_id' => $this->project->id]);});@@ -53,7 +54,7 @@ test('returns 404 when application uuid belongs to another team', function () {$otherTeam->members()->attach($otherUser->id, ['role' => 'owner']);$otherServer = Server::factory()->create(['team_id' => $otherTeam->id]);- $otherDestination = StandaloneDocker::factory()->create(['server_id' => $otherServer->id]);+ $otherDestination = StandaloneDocker::where('server_id', $otherServer->id)->first();$otherProject = Project::factory()->create(['team_id' => $otherTeam->id]);$otherEnvironment = Environment::factory()->create(['project_id' => $otherProject->id]);@@ -78,3 +79,45 @@ test('returns 404 for nonexistent application uuid', function () {$response->assertNotFound();$response->assertJson(['message' => 'Application not found.']);});++test('returns 404 when server uuid belongs to another team', function () {+ $otherTeam = Team::factory()->create();+ $otherUser = User::factory()->create();+ $otherTeam->members()->attach($otherUser->id, ['role' => 'owner']);++ $otherServer = Server::factory()->create(['team_id' => $otherTeam->id]);++ $response = $this->withHeaders(authHeaders())+ ->getJson("/api/v1/servers/{$otherServer->uuid}/domains");++ $response->assertNotFound();+ $response->assertJson(['message' => 'Server not found.']);+});++test('only returns domains for applications on the specified server', function () {+ $application = Application::factory()->create([+ 'fqdn' => 'https://app-on-server.example.com',+ 'environment_id' => $this->environment->id,+ 'destination_id' => $this->destination->id,+ 'destination_type' => $this->destination->getMorphClass(),+ ]);++ $otherServer = Server::factory()->create(['team_id' => $this->team->id]);+ $otherDestination = StandaloneDocker::where('server_id', $otherServer->id)->first();++ $applicationOnOtherServer = Application::factory()->create([+ 'fqdn' => 'https://app-on-other-server.example.com',+ 'environment_id' => $this->environment->id,+ 'destination_id' => $otherDestination->id,+ 'destination_type' => $otherDestination->getMorphClass(),+ ]);++ $response = $this->withHeaders(authHeaders())+ ->getJson("/api/v1/servers/{$this->server->uuid}/domains");++ $response->assertOk();+ $responseContent = $response->json();+ $allDomains = collect($responseContent)->pluck('domains')->flatten()->toArray();+ expect($allDomains)->toContain('app-on-server.example.com');+ expect($allDomains)->not->toContain('app-on-other-server.example.com');+});