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): extract resource UUIDs from route parameters
Andras Bacsai8a164735cb3b
diff --git a/app/Http/Controllers/Api/ApplicationsController.php b/app/Http/Controllers/Api/ApplicationsController.phpindex 6f34b43bfc..5819441b7f 100644--- a/app/Http/Controllers/Api/ApplicationsController.php+++ b/app/Http/Controllers/Api/ApplicationsController.php@@ -2957,7 +2957,7 @@ class ApplicationsController extends Controllerif ($return instanceof \Illuminate\Http\JsonResponse) {return $return;}- $application = Application::ownedByCurrentTeamAPI($teamId)->where('uuid', $request->uuid)->first();+ $application = Application::ownedByCurrentTeamAPI($teamId)->where('uuid', $request->route('uuid'))->first();if (! $application) {return response()->json([@@ -3158,7 +3158,7 @@ class ApplicationsController extends Controllerif ($return instanceof \Illuminate\Http\JsonResponse) {return $return;}- $application = Application::ownedByCurrentTeamAPI($teamId)->where('uuid', $request->uuid)->first();+ $application = Application::ownedByCurrentTeamAPI($teamId)->where('uuid', $request->route('uuid'))->first();if (! $application) {return response()->json([@@ -3352,7 +3352,7 @@ class ApplicationsController extends Controllerif (is_null($teamId)) {return invalidTokenResponse();}- $application = Application::ownedByCurrentTeamAPI($teamId)->where('uuid', $request->uuid)->first();+ $application = Application::ownedByCurrentTeamAPI($teamId)->where('uuid', $request->route('uuid'))->first();if (! $application) {return response()->json([@@ -3509,7 +3509,7 @@ class ApplicationsController extends Controllerif (is_null($teamId)) {return invalidTokenResponse();}- $application = Application::ownedByCurrentTeamAPI($teamId)->where('uuid', $request->uuid)->first();+ $application = Application::ownedByCurrentTeamAPI($teamId)->where('uuid', $request->route('uuid'))->first();if (! $application) {return response()->json([@@ -3519,7 +3519,7 @@ class ApplicationsController extends Controller$this->authorize('manageEnvironment', $application);- $found_env = EnvironmentVariable::where('uuid', $request->env_uuid)+ $found_env = EnvironmentVariable::where('uuid', $request->route('env_uuid'))->where('resourceable_type', Application::class)->where('resourceable_id', $application->id)->first();diff --git a/app/Http/Controllers/Api/ServicesController.php b/app/Http/Controllers/Api/ServicesController.phpindex 32097443e6..de504c1a4c 100644--- a/app/Http/Controllers/Api/ServicesController.php+++ b/app/Http/Controllers/Api/ServicesController.php@@ -1207,7 +1207,7 @@ class ServicesController extends Controllerreturn invalidTokenResponse();}- $service = Service::whereRelation('environment.project.team', 'id', $teamId)->whereUuid($request->uuid)->first();+ $service = Service::whereRelation('environment.project.team', 'id', $teamId)->whereUuid($request->route('uuid'))->first();if (! $service) {return response()->json(['message' => 'Service not found.'], 404);}@@ -1342,7 +1342,7 @@ class ServicesController extends Controllerreturn invalidTokenResponse();}- $service = Service::whereRelation('environment.project.team', 'id', $teamId)->whereUuid($request->uuid)->first();+ $service = Service::whereRelation('environment.project.team', 'id', $teamId)->whereUuid($request->route('uuid'))->first();if (! $service) {return response()->json(['message' => 'Service not found.'], 404);}@@ -1461,7 +1461,7 @@ class ServicesController extends Controllerreturn invalidTokenResponse();}- $service = Service::whereRelation('environment.project.team', 'id', $teamId)->whereUuid($request->uuid)->first();+ $service = Service::whereRelation('environment.project.team', 'id', $teamId)->whereUuid($request->route('uuid'))->first();if (! $service) {return response()->json(['message' => 'Service not found.'], 404);}@@ -1570,14 +1570,14 @@ class ServicesController extends Controllerreturn invalidTokenResponse();}- $service = Service::whereRelation('environment.project.team', 'id', $teamId)->whereUuid($request->uuid)->first();+ $service = Service::whereRelation('environment.project.team', 'id', $teamId)->whereUuid($request->route('uuid'))->first();if (! $service) {return response()->json(['message' => 'Service not found.'], 404);}$this->authorize('manageEnvironment', $service);- $env = EnvironmentVariable::where('uuid', $request->env_uuid)+ $env = EnvironmentVariable::where('uuid', $request->route('env_uuid'))->where('resourceable_type', Service::class)->where('resourceable_id', $service->id)->first();diff --git a/tests/Feature/EnvironmentVariableUpdateApiTest.php b/tests/Feature/EnvironmentVariableUpdateApiTest.phpindex 9c45dc5ae7..1ff528bbff 100644--- a/tests/Feature/EnvironmentVariableUpdateApiTest.php+++ b/tests/Feature/EnvironmentVariableUpdateApiTest.php@@ -3,6 +3,7 @@use App\Models\Application;use App\Models\Environment;use App\Models\EnvironmentVariable;+use App\Models\InstanceSettings;use App\Models\Project;use App\Models\Server;use App\Models\Service;@@ -14,6 +15,8 @@ use Illuminate\Foundation\Testing\RefreshDatabase;uses(RefreshDatabase::class);beforeEach(function () {+ InstanceSettings::updateOrCreate(['id' => 0]);+$this->team = Team::factory()->create();$this->user = User::factory()->create();$this->team->members()->attach($this->user->id, ['role' => 'owner']);@@ -24,7 +27,7 @@ beforeEach(function () {$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]);});@@ -117,6 +120,35 @@ describe('PATCH /api/v1/services/{uuid}/envs', function () {$response->assertStatus(422);});++ test('uses route uuid and ignores uuid in request body', function () {+ $service = Service::factory()->create([+ 'server_id' => $this->server->id,+ 'destination_id' => $this->destination->id,+ 'destination_type' => $this->destination->getMorphClass(),+ 'environment_id' => $this->environment->id,+ ]);++ EnvironmentVariable::create([+ 'key' => 'TEST_KEY',+ 'value' => 'old-value',+ 'resourceable_type' => Service::class,+ 'resourceable_id' => $service->id,+ 'is_preview' => false,+ ]);++ $response = $this->withHeaders([+ 'Authorization' => 'Bearer '.$this->bearerToken,+ 'Content-Type' => 'application/json',+ ])->patchJson("/api/v1/services/{$service->uuid}/envs", [+ 'key' => 'TEST_KEY',+ 'value' => 'new-value',+ 'uuid' => 'bogus-uuid-from-body',+ ]);++ $response->assertStatus(201);+ $response->assertJsonFragment(['key' => 'TEST_KEY']);+ });});describe('PATCH /api/v1/applications/{uuid}/envs', function () {@@ -191,4 +223,32 @@ describe('PATCH /api/v1/applications/{uuid}/envs', function () {$response->assertStatus(422);});++ test('rejects unknown fields in request body', function () {+ $application = Application::factory()->create([+ 'environment_id' => $this->environment->id,+ 'destination_id' => $this->destination->id,+ 'destination_type' => $this->destination->getMorphClass(),+ ]);++ EnvironmentVariable::create([+ 'key' => 'TEST_KEY',+ 'value' => 'old-value',+ 'resourceable_type' => Application::class,+ 'resourceable_id' => $application->id,+ 'is_preview' => false,+ ]);++ $response = $this->withHeaders([+ 'Authorization' => 'Bearer '.$this->bearerToken,+ 'Content-Type' => 'application/json',+ ])->patchJson("/api/v1/applications/{$application->uuid}/envs", [+ 'key' => 'TEST_KEY',+ 'value' => 'new-value',+ 'uuid' => 'bogus-uuid-from-body',+ ]);++ $response->assertStatus(422);+ $response->assertJsonFragment(['uuid' => ['This field is not allowed.']]);+ });});