fix(domains): allow clearing resource domains without TypeError (#11083)

This commit is contained in:
Andras Bacsai
2026-07-29 16:49:43 +02:00
committed by GitHub
3 changed files with 142 additions and 1 deletions
+10 -1
View File
@@ -3803,8 +3803,17 @@ function loggy($message = null, array $context = [])
return app('log')->debug($message, $context);
}
function sslipDomainWarning(string $domains)
/**
* Warn when any domain uses HTTPS with an sslip hostname.
*
* Empty/null domain lists are valid (domains removed) and produce no warning.
*/
function sslipDomainWarning(?string $domains): bool
{
if (blank($domains)) {
return false;
}
$domains = str($domains)->trim()->explode(',');
$showSslipHttpsWarning = false;
$domains->each(function ($domain) use (&$showSslipHttpsWarning) {
@@ -0,0 +1,104 @@
<?php
use App\Livewire\Project\Application\General;
use App\Models\Application;
use App\Models\Environment;
use App\Models\InstanceSettings;
use App\Models\PrivateKey;
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 Livewire\Livewire;
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->actingAs($this->user);
session(['currentTeam' => $this->team]);
InstanceSettings::unguarded(function () {
InstanceSettings::updateOrCreate(['id' => 0], []);
});
$this->project = Project::factory()->create(['team_id' => $this->team->id]);
$this->environment = Environment::factory()->create(['project_id' => $this->project->id]);
$this->privateKey = PrivateKey::create([
'name' => 'Test Key',
'private_key' => '-----BEGIN OPENSSH PRIVATE KEY-----
b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
QyNTUxOQAAACBbhpqHhqv6aI67Mj9abM3DVbmcfYhZAhC7ca4d9UCevAAAAJi/QySHv0Mk
hwAAAAtzc2gtZWQyNTUxOQAAACBbhpqHhqv6aI67Mj9abM3DVbmcfYhZAhC7ca4d9UCevA
AAAECBQw4jg1WRT2IGHMncCiZhURCts2s24HoDS0thHnnRKVuGmoeGq/pojrsyP1pszcNV
uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
-----END OPENSSH PRIVATE KEY-----',
'team_id' => $this->team->id,
]);
$this->server = Server::factory()->create([
'team_id' => $this->team->id,
'private_key_id' => $this->privateKey->id,
]);
$this->destination = StandaloneDocker::where('server_id', $this->server->id)->first()
?? StandaloneDocker::factory()->create(['server_id' => $this->server->id, 'network' => 'coolify-test']);
});
/**
* Regression for #11079: removing all domains must save without TypeError from
* sslipDomainWarning(null) after normalizeApplicationDomains returns null.
*/
test('can clear application domains and save successfully', function () {
$application = Application::factory()->create([
'environment_id' => $this->environment->id,
'destination_id' => $this->destination->id,
'destination_type' => StandaloneDocker::class,
'build_pack' => 'nixpacks',
'fqdn' => 'https://example.com',
'static_image' => 'nginx:alpine',
'base_directory' => '/',
'ports_exposes' => '3000',
'is_http_basic_auth_enabled' => false,
'redirect' => 'no',
]);
Livewire::test(General::class, ['application' => $application])
->assertSuccessful()
->set('fqdn', null)
->call('submit')
->assertHasNoErrors()
->assertNotDispatched('error')
->assertDispatched('success');
$application->refresh();
expect($application->fqdn)->toBeNull();
});
test('can clear application domains via empty string and save successfully', function () {
$application = Application::factory()->create([
'environment_id' => $this->environment->id,
'destination_id' => $this->destination->id,
'destination_type' => StandaloneDocker::class,
'build_pack' => 'nixpacks',
'fqdn' => 'https://app.example.com,https://www.example.com',
'static_image' => 'nginx:alpine',
'base_directory' => '/',
'ports_exposes' => '3000',
'is_http_basic_auth_enabled' => false,
'redirect' => 'no',
]);
Livewire::test(General::class, ['application' => $application])
->assertSuccessful()
->set('fqdn', '')
->call('submit')
->assertHasNoErrors()
->assertNotDispatched('error')
->assertDispatched('success');
$application->refresh();
expect($application->fqdn)->toBeNull();
});
+28
View File
@@ -0,0 +1,28 @@
<?php
/**
* Regression for #11079 / #11030: clearing domains normalizes to null, then
* sslipDomainWarning must accept null without a TypeError.
*/
it('returns false when domains are null', function () {
expect(sslipDomainWarning(null))->toBeFalse();
});
it('returns false when domains are empty or whitespace', function () {
expect(sslipDomainWarning(''))->toBeFalse();
expect(sslipDomainWarning(' '))->toBeFalse();
});
it('returns false for non-sslip https domains', function () {
expect(sslipDomainWarning('https://example.com'))->toBeFalse();
expect(sslipDomainWarning('http://app.example.com,https://www.example.com'))->toBeFalse();
});
it('returns false for http sslip domains without https', function () {
expect(sslipDomainWarning('http://app.127.0.0.1.sslip.io'))->toBeFalse();
});
it('returns true when any domain uses https with sslip', function () {
expect(sslipDomainWarning('https://app.127.0.0.1.sslip.io'))->toBeTrue();
expect(sslipDomainWarning('https://example.com,https://app.127.0.0.1.sslip.io'))->toBeTrue();
});