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(previews): restrict PR loading and status updates to GitHub Apps
Andras Bacsai4c2253c2ad34
diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.phpindex b2340c505e..f75e23bfe6 100644--- a/app/Jobs/ApplicationDeploymentJob.php+++ b/app/Jobs/ApplicationDeploymentJob.php@@ -294,7 +294,7 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue$this->preview->generate_preview_fqdn();}}- if ($this->application->is_github_based()) {+ if ($this->application->isGithubAppSource()) {ApplicationPullRequestUpdateJob::dispatch(application: $this->application, preview: $this->preview, deployment_uuid: $this->deployment_uuid, status: ProcessStatus::IN_PROGRESS);}if ($this->application->build_pack === 'dockerfile') {@@ -384,7 +384,7 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue$this->detectBuildKitCapabilities();$this->decide_what_to_do();} catch (Exception $e) {- if ($this->pull_request_id !== 0 && $this->application->is_github_based()) {+ if ($this->pull_request_id !== 0 && $this->application->isGithubAppSource()) {ApplicationPullRequestUpdateJob::dispatch(application: $this->application, preview: $this->preview, deployment_uuid: $this->deployment_uuid, status: ProcessStatus::ERROR);}$this->fail($e);@@ -605,7 +605,7 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue}if ($this->pull_request_id !== 0) {- if ($this->application->is_github_based()) {+ if ($this->application->isGithubAppSource()) {try {ApplicationPullRequestUpdateJob::dispatch(application: $this->application, preview: $this->preview, deployment_uuid: $this->deployment_uuid, status: ProcessStatus::FINISHED);} catch (Exception $e) {diff --git a/app/Livewire/Project/Application/Previews.php b/app/Livewire/Project/Application/Previews.phpindex 14da6ac62c..86dbf4e800 100644--- a/app/Livewire/Project/Application/Previews.php+++ b/app/Livewire/Project/Application/Previews.php@@ -94,6 +94,9 @@ class Previews extends Component{try {$this->authorize('update', $this->application);+ if (! $this->application->isGithubAppSource()) {+ throw new \Exception('Loading pull requests is only supported for GitHub App sources.');+ }['rate_limit_remaining' => $rate_limit_remaining, 'data' => $data] = githubApi(source: $this->application->source, endpoint: "/repos/{$this->application->git_repository}/pulls");$this->rate_limit_remaining = $rate_limit_remaining;$this->pull_requests = $data->sortBy('number')->values();diff --git a/app/Models/Application.php b/app/Models/Application.phpindex e2694d01c1..277b7ec246 100644--- a/app/Models/Application.php+++ b/app/Models/Application.php@@ -652,6 +652,11 @@ class Application extends BaseModelreturn false;}+ public function isGithubAppSource(): bool+ {+ return $this->source instanceof GithubApp;+ }+public function isForceHttpsEnabled(){return data_get($this, 'settings.is_force_https_enabled', false);diff --git a/resources/views/livewire/project/application/previews.blade.php b/resources/views/livewire/project/application/previews.blade.phpindex 36280e873b..23edbf3966 100644--- a/resources/views/livewire/project/application/previews.blade.php+++ b/resources/views/livewire/project/application/previews.blade.php@@ -7,7 +7,7 @@helper="Automatic pull request deployments and who can trigger them."><x-slot:actions>@can('update', $application)- @if ($application->is_github_based())+ @if ($application->isGithubAppSource())<x-modal-input title="Pull requests"subtitle="Load open pull requests from GitHub, then configure or deploy a preview.":wireIgnore="false" :isLarge="true">diff --git a/tests/Feature/ApplicationPreviewSettingsTest.php b/tests/Feature/ApplicationPreviewSettingsTest.phpindex 9df838d763..02be2b8c6c 100644--- a/tests/Feature/ApplicationPreviewSettingsTest.php+++ b/tests/Feature/ApplicationPreviewSettingsTest.php@@ -3,6 +3,7 @@use App\Livewire\Project\Application\Previews;use App\Models\Application;use App\Models\Environment;+use App\Models\GitlabApp;use App\Models\InstanceSettings;use App\Models\PrivateKey;use App\Models\Project;@@ -117,6 +118,23 @@ it('renders preview deployment enablement as a section action', function () {expect($this->application->fresh()->settings->is_preview_deployments_enabled)->toBeTrue();});+it('does not load GitHub pull requests for GitLab sources', function () {+ $gitlabApp = GitlabApp::create([+ 'name' => 'Self-hosted GitLab',+ 'api_url' => 'https://gitlab.example.com/api/v4',+ 'html_url' => 'https://gitlab.example.com',+ 'team_id' => $this->team->id,+ ]);+ $this->application->update(['source_id' => $gitlabApp->id, 'source_type' => GitlabApp::class]);++ Livewire::test(Previews::class, ['application' => $this->application->fresh()])+ ->assertSee('PR deployment access')+ ->assertDontSee('Load pull requests')+ ->call('load_prs')+ ->assertSet('rate_limit_remaining', 0)+ ->assertDispatched('error');+});+it('does not show git preview settings for non-git applications', function (string $buildPack, ?string $dockerfile) {$this->application->update(['build_pack' => $buildPack, 'dockerfile' => $dockerfile]);