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(servers): change the server role only through its checked flow
Andras Bacsaiaa16cfb42054
diff --git a/app/Livewire/Server/Show.php b/app/Livewire/Server/Show.phpindex d7420b7d9c..cea2c3f465 100644--- a/app/Livewire/Server/Show.php+++ b/app/Livewire/Server/Show.php@@ -249,9 +249,8 @@ class Show extends Component$this->server->settings->connection_timeout = $this->connectionTimeout;$this->server->settings->wildcard_domain = $this->wildcardDomain;- $role = ServerRole::from($this->serverRole);- $this->server->settings->server_role = $role;- $this->server->settings->is_build_server = $role === ServerRole::BUILD;+ // The role is only changed through requestServerRoleChange()/confirmServerRoleChange().+ $this->serverRole = $this->server->settings->effectiveServerRole()->value;$this->server->settings->is_metrics_enabled = $this->isMetricsEnabled;$this->server->settings->sentinel_token = $this->sentinelToken;$this->server->settings->sentinel_metrics_refresh_rate_seconds = $this->sentinelMetricsRefreshRateSeconds;@@ -527,6 +526,8 @@ class Show extends Componentprivate function saveServerRole(ServerRole $role): void{$this->serverRole = $role->value;+ $this->server->settings->server_role = $role;+ $this->server->settings->is_build_server = $role === ServerRole::BUILD;if ($role === ServerRole::BUILD && $this->server->isSentinelEnabled()) {$this->isMetricsEnabled = false;$this->isSentinelDebugEnabled = false;diff --git a/tests/Feature/ServerRoleSubmitBypassTest.php b/tests/Feature/ServerRoleSubmitBypassTest.phpnew file mode 100644index 0000000000..5d06d875f3--- /dev/null+++ b/tests/Feature/ServerRoleSubmitBypassTest.php@@ -0,0 +1,80 @@+<?php++use App\Livewire\Server\Show;+use App\Models\Application;+use App\Models\Environment;+use App\Models\InstanceSettings;+use App\Models\Project;+use App\Models\Server;+use App\Models\StandaloneDocker;+use App\Models\Team;+use App\Models\User;+use Illuminate\Foundation\Testing\RefreshDatabase;+use Illuminate\Support\Facades\Process;+use Livewire\Livewire;++uses(RefreshDatabase::class);++beforeEach(function () {+ Server::flushIdentityMap();+ Process::fake();+ InstanceSettings::forceCreate(['id' => 0]);++ $this->team = Team::factory()->create();+ $this->user = User::factory()->create();+ $this->team->members()->attach($this->user->id, ['role' => 'owner']);+ session(['currentTeam' => $this->team]);++ $this->server = Server::factory()->create(['team_id' => $this->team->id]);+ $this->server->settings()->update([+ 'is_reachable' => true,+ 'is_usable' => true,+ 'server_role' => 'both',+ 'is_build_server' => false,+ 'is_sentinel_enabled' => false,+ ]);+ $this->server->refresh()->load('settings');++ $destination = StandaloneDocker::where('server_id', $this->server->id)->firstOrFail();+ $project = Project::factory()->create(['team_id' => $this->team->id]);+ $environment = Environment::factory()->create(['project_id' => $project->id]);+ Application::factory()->create([+ 'environment_id' => $environment->id,+ 'destination_id' => $destination->id,+ 'destination_type' => $destination->getMorphClass(),+ ]);+});++afterEach(function () {+ Server::flushIdentityMap();+});++it('does not save a server role through submit', function () {+ Livewire::actingAs($this->user)+ ->test(Show::class, ['server_uuid' => $this->server->uuid])+ ->set('serverRole', 'build')+ ->call('submit')+ ->assertDispatched('success')+ ->assertSet('serverRole', 'both');++ $settings = $this->server->settings->fresh();+ expect($settings->server_role->value)->toBe('both')+ ->and($settings->is_build_server)->toBeFalse();+});++it('still saves a confirmed role change', function () {+ $this->server->settings()->update(['server_role' => 'deployment']);+ $buildServer = Server::factory()->create(['team_id' => $this->team->id]);+ $buildServer->settings()->update(['server_role' => 'build', 'is_build_server' => true, 'is_reachable' => true, 'is_usable' => true]);++ Livewire::actingAs($this->user)+ ->test(Show::class, ['server_uuid' => $this->server->uuid])+ ->assertSet('serverRole', 'deployment')+ ->set('serverRole', 'both')+ ->call('requestServerRoleChange')+ ->assertSet('pendingServerRole', 'both')+ ->call('confirmServerRoleChange')+ ->assertSet('serverRole', 'both');++ expect($this->server->settings->fresh()->server_role->value)->toBe('both');+});