diff --git a/resources/views/livewire/project/database/redis/status-info.blade.php b/resources/views/livewire/project/database/redis/status-info.blade.php
new file mode 100644
index 000000000..9f329504c
--- /dev/null
+++ b/resources/views/livewire/project/database/redis/status-info.blade.php
@@ -0,0 +1,51 @@
+
+
+ @if ($dbUrlPublic)
+
+ @endif
+
+
+
+
SSL Configuration
+ @if ($enableSsl && $certificateValidUntil)
+
+
+ @if ($enableSsl && $certificateValidUntil)
+
Valid until:
+ @if (now()->gt($certificateValidUntil))
+ {{ $certificateValidUntil->format('d.m.Y H:i:s') }} - Expired
+ @elseif(now()->addDays(30)->gt($certificateValidUntil))
+ {{ $certificateValidUntil->format('d.m.Y H:i:s') }} - Expiring
+ soon
+ @else
+ {{ $certificateValidUntil->format('d.m.Y H:i:s') }}
+ @endif
+
+ @endif
+
+
+ @if (str($database->status)->contains('exited'))
+
+
+
+
diff --git a/tests/Feature/DatabaseSslStatusRefreshTest.php b/tests/Feature/DatabaseSslStatusRefreshTest.php
index e62ef48ad..b663213a5 100644
--- a/tests/Feature/DatabaseSslStatusRefreshTest.php
+++ b/tests/Feature/DatabaseSslStatusRefreshTest.php
@@ -7,11 +7,16 @@
use App\Livewire\Project\Database\Mysql\General as MysqlGeneral;
use App\Livewire\Project\Database\Postgresql\General as PostgresqlGeneral;
use App\Livewire\Project\Database\Redis\General as RedisGeneral;
+use App\Livewire\Project\Database\Redis\StatusInfo as RedisStatusInfo;
+use App\Livewire\Server\Sentinel;
+use App\Livewire\Server\Show;
use App\Models\Environment;
use App\Models\Project;
use App\Models\Server;
use App\Models\StandaloneDocker;
use App\Models\StandaloneMysql;
+use App\Models\StandalonePostgresql;
+use App\Models\StandaloneRedis;
use App\Models\Team;
use App\Models\User;
use Illuminate\Foundation\Testing\RefreshDatabase;
@@ -28,25 +33,75 @@
session(['currentTeam' => $this->team]);
});
-dataset('ssl-aware-database-general-components', [
+dataset('database-general-forms-without-broadcasts', [
+ // Redis splits status-derived display into a sibling component; the form itself
+ // takes no broadcast listeners. Other DBs use the narrower refreshStatus pattern below.
+ RedisGeneral::class,
+]);
+
+dataset('database-general-forms-with-narrow-refresh', [
+ // Form listens to status broadcasts but routes them to refreshStatus, which only
+ // writes display-only properties (URLs, cert expiry) — never input-bound text fields.
+ PostgresqlGeneral::class,
MysqlGeneral::class,
MariadbGeneral::class,
MongodbGeneral::class,
- RedisGeneral::class,
- PostgresqlGeneral::class,
KeydbGeneral::class,
DragonflyGeneral::class,
]);
-it('maps database status broadcasts to refresh for ssl-aware database general components', function (string $componentClass) {
- $component = app($componentClass);
- $listeners = $component->getListeners();
+dataset('database-status-info-components', [
+ RedisStatusInfo::class,
+]);
- expect($listeners["echo-private:user.{$this->user->id},DatabaseStatusChanged"])->toBe('refresh')
- ->and($listeners["echo-private:team.{$this->team->id},ServiceChecked"])->toBe('refresh');
-})->with('ssl-aware-database-general-components');
+it('does not subscribe the form to status broadcasts when display lives in a sibling', function (string $componentClass) {
+ // Regression guard for coolify#6062 / #6354 / #9695:
+ // For DBs whose status-derived display moved into a sibling component, the form
+ // itself must not subscribe to status broadcasts at all.
+ $listeners = resolveLivewireListeners(app($componentClass));
-it('reloads the mysql database model when refreshing so ssl controls follow the latest status', function () {
+ expect($listeners)
+ ->not->toHaveKey("echo-private:user.{$this->user->id},DatabaseStatusChanged")
+ ->not->toHaveKey("echo-private:team.{$this->team->id},ServiceChecked")
+ ->not->toHaveKey("echo-private:team.{$this->team->id},ServiceStatusChanged");
+})->with('database-general-forms-without-broadcasts');
+
+it('routes status broadcasts to refreshStatus, never to a handler that re-syncs inputs', function (string $componentClass) {
+ // Regression guard for coolify#6062 / #6354 / #9695:
+ // The form may listen to broadcasts, but only to a narrow handler (refreshStatus)
+ // that touches display-only properties. Routing to `refresh` or `$refresh` would
+ // re-sync every input property from the DB and wipe in-progress typing.
+ $listeners = resolveLivewireListeners(app($componentClass));
+
+ $databaseStatusKey = "echo-private:user.{$this->user->id},DatabaseStatusChanged";
+ $serviceCheckedKey = "echo-private:team.{$this->team->id},ServiceChecked";
+
+ expect($listeners[$databaseStatusKey] ?? null)->toBe('refreshStatus')
+ ->and($listeners[$serviceCheckedKey] ?? null)->toBe('refreshStatus');
+})->with('database-general-forms-with-narrow-refresh');
+
+function resolveLivewireListeners(object $component): array
+{
+ // Livewire's HandlesEvents trait declares getListeners() as protected,
+ // so subclasses that override it as public are callable directly, but
+ // subclasses that rely on $listeners are not. Reflection handles both.
+ $method = new ReflectionMethod($component, 'getListeners');
+ $method->setAccessible(true);
+
+ return (array) $method->invoke($component);
+}
+
+it('auto-refreshes status-info sibling on database status broadcasts', function (string $componentClass) {
+ // Status-derived display (connection URLs, SSL gate hint, cert expiry) lives in a sibling
+ // Livewire component so it can re-render on broadcasts without touching the form's DOM.
+ $listeners = resolveLivewireListeners(app($componentClass));
+
+ expect($listeners)
+ ->toHaveKey("echo-private:user.{$this->user->id},DatabaseStatusChanged")
+ ->toHaveKey("echo-private:team.{$this->team->id},ServiceChecked");
+})->with('database-status-info-components');
+
+it('reloads the mysql database model when refresh is called directly so ssl controls follow the latest status', function () {
$server = Server::factory()->create(['team_id' => $this->team->id]);
$destination = StandaloneDocker::where('server_id', $server->id)->first();
$project = Project::factory()->create(['team_id' => $this->team->id]);
@@ -75,3 +130,91 @@
$component->call('refresh')
->assertSee('Database should be stopped to change this settings.');
});
+
+it('does not clobber server form text inputs when sentinel restarts', function () {
+ $server = Server::factory()->create([
+ 'team_id' => $this->team->id,
+ 'name' => 'persisted-server-name',
+ ]);
+
+ $component = Livewire::test(Sentinel::class, ['server_uuid' => $server->uuid])
+ ->set('sentinelToken', 'user-was-typing-this-token');
+
+ $component->call('handleSentinelRestarted', ['serverUuid' => $server->uuid]);
+
+ expect($component->get('sentinelToken'))->toBe('user-was-typing-this-token');
+});
+
+it('does not clobber server form text inputs when server validation completes', function () {
+ $server = Server::factory()->create([
+ 'team_id' => $this->team->id,
+ 'name' => 'persisted-server-name',
+ ]);
+
+ $component = Livewire::test(Show::class, ['server_uuid' => $server->uuid])
+ ->set('name', 'user-was-typing-here')
+ ->set('ip', '203.0.113.42');
+
+ $component->call('handleServerValidated', ['serverUuid' => $server->uuid]);
+
+ expect($component->get('name'))->toBe('user-was-typing-here')
+ ->and($component->get('ip'))->toBe('203.0.113.42');
+});
+
+it('preserves typed input on the postgres form when refreshStatus runs', function () {
+ $server = Server::factory()->create(['team_id' => $this->team->id]);
+ $destination = StandaloneDocker::where('server_id', $server->id)->first();
+ $project = Project::factory()->create(['team_id' => $this->team->id]);
+ $environment = Environment::factory()->create(['project_id' => $project->id]);
+
+ $database = StandalonePostgresql::create([
+ 'name' => 'persisted-name',
+ 'image' => 'postgres:16',
+ 'postgres_user' => 'postgres',
+ 'postgres_password' => 'password',
+ 'postgres_db' => 'postgres',
+ 'status' => 'exited:unhealthy',
+ 'enable_ssl' => false,
+ 'is_log_drain_enabled' => false,
+ 'environment_id' => $environment->id,
+ 'destination_id' => $destination->id,
+ 'destination_type' => $destination->getMorphClass(),
+ ]);
+
+ $component = Livewire::test(PostgresqlGeneral::class, ['database' => $database])
+ ->set('name', 'user-was-typing-here')
+ ->set('portsMappings', '5433:5432');
+
+ $component->call('refreshStatus');
+
+ expect($component->get('name'))->toBe('user-was-typing-here')
+ ->and($component->get('portsMappings'))->toBe('5433:5432');
+});
+
+it('shows the redis ssl gate hint after the sibling is refreshed', function () {
+ $server = Server::factory()->create(['team_id' => $this->team->id]);
+ $destination = StandaloneDocker::where('server_id', $server->id)->first();
+ $project = Project::factory()->create(['team_id' => $this->team->id]);
+ $environment = Environment::factory()->create(['project_id' => $project->id]);
+
+ $database = StandaloneRedis::create([
+ 'name' => 'test-redis',
+ 'image' => 'redis:7',
+ 'redis_password' => 'password',
+ 'redis_username' => 'default',
+ 'status' => 'exited:unhealthy',
+ 'enable_ssl' => true,
+ 'is_log_drain_enabled' => false,
+ 'environment_id' => $environment->id,
+ 'destination_id' => $destination->id,
+ 'destination_type' => $destination->getMorphClass(),
+ ]);
+
+ $component = Livewire::test(RedisStatusInfo::class, ['database' => $database])
+ ->assertDontSee('Database should be stopped to change this settings.');
+
+ $database->fill(['status' => 'running:healthy'])->save();
+
+ $component->call('refresh')
+ ->assertSee('Database should be stopped to change this settings.');
+});
From e7e65831a7c0d6b2ac39e98f0ded48afb39317db Mon Sep 17 00:00:00 2001
From: Aditya Tripathi
Date: Thu, 21 May 2026 08:31:08 +0000
Subject: [PATCH 017/117] fix(livewire): preserve wire:dirty across DB status
broadcasts
The earlier refreshStatus fix kept user-typed values intact but Livewire still
absorbed deferred wire:model values into the snapshot on every broadcast-
triggered roundtrip, clearing the unsaved-changes indicator and making the form
look auto-saved. Move all status-derived display (DB URLs, SSL toggle/mode,
cert expiry) out of each DB General form into a sibling StatusInfo Livewire
component, so the form never roundtrips on broadcasts.
Shared scaffolding lives in App\Traits\HasDatabaseStatusInfo plus an x-database-
status-info Blade component, leaving each per-DB StatusInfo class as a ~20-50
line declaration of label, SSL mode options, and SSL save hooks. Parents
dispatch databaseUpdated from save methods so the sibling refreshes after writes.
Tests cover the architecture (no DB form subscribes to status broadcasts) and
the sibling's refresh-on-status-change behavior.
---
.../Project/Database/Clickhouse/General.php | 27 +--
.../Database/Clickhouse/StatusInfo.php | 31 ++++
.../Project/Database/Dragonfly/General.php | 104 +----------
.../Project/Database/Dragonfly/StatusInfo.php | 26 +++
.../Project/Database/Keydb/General.php | 106 +----------
.../Project/Database/Keydb/StatusInfo.php | 26 +++
.../Project/Database/Mariadb/General.php | 107 +-----------
.../Project/Database/Mariadb/StatusInfo.php | 21 +++
.../Project/Database/Mongodb/General.php | 119 +------------
.../Project/Database/Mongodb/StatusInfo.php | 51 ++++++
.../Project/Database/Mysql/General.php | 119 +------------
.../Project/Database/Mysql/StatusInfo.php | 51 ++++++
.../Project/Database/Postgresql/General.php | 124 +------------
.../Database/Postgresql/StatusInfo.php | 52 ++++++
.../Project/Database/Redis/StatusInfo.php | 103 +----------
app/Traits/HasDatabaseStatusInfo.php | 164 ++++++++++++++++++
.../components/database-status-info.blade.php | 94 ++++++++++
.../database/clickhouse/general.blade.php | 13 +-
.../database/dragonfly/general.blade.php | 54 +-----
.../project/database/keydb/general.blade.php | 53 +-----
.../database/mariadb/general.blade.php | 52 +-----
.../database/mongodb/general.blade.php | 77 +-------
.../project/database/mysql/general.blade.php | 74 +-------
.../database/postgresql/general.blade.php | 126 +++-----------
.../database/redis/status-info.blade.php | 51 ------
.../project/database/status-info.blade.php | 6 +
.../Feature/DatabaseSslStatusRefreshTest.php | 80 +++------
27 files changed, 603 insertions(+), 1308 deletions(-)
create mode 100644 app/Livewire/Project/Database/Clickhouse/StatusInfo.php
create mode 100644 app/Livewire/Project/Database/Dragonfly/StatusInfo.php
create mode 100644 app/Livewire/Project/Database/Keydb/StatusInfo.php
create mode 100644 app/Livewire/Project/Database/Mariadb/StatusInfo.php
create mode 100644 app/Livewire/Project/Database/Mongodb/StatusInfo.php
create mode 100644 app/Livewire/Project/Database/Mysql/StatusInfo.php
create mode 100644 app/Livewire/Project/Database/Postgresql/StatusInfo.php
create mode 100644 app/Traits/HasDatabaseStatusInfo.php
create mode 100644 resources/views/components/database-status-info.blade.php
delete mode 100644 resources/views/livewire/project/database/redis/status-info.blade.php
create mode 100644 resources/views/livewire/project/database/status-info.blade.php
diff --git a/app/Livewire/Project/Database/Clickhouse/General.php b/app/Livewire/Project/Database/Clickhouse/General.php
index edcb31f5e..b5c0ffff4 100644
--- a/app/Livewire/Project/Database/Clickhouse/General.php
+++ b/app/Livewire/Project/Database/Clickhouse/General.php
@@ -40,34 +40,17 @@ class General extends Component
public ?string $customDockerRunOptions = null;
- public ?string $dbUrl = null;
-
- public ?string $dbUrlPublic = null;
-
public bool $isLogDrainEnabled = false;
public function getListeners()
{
- $userId = Auth::id();
$teamId = Auth::user()->currentTeam()->id;
return [
"echo-private:team.{$teamId},DatabaseProxyStopped" => 'databaseProxyStopped',
- // Broadcasts go to refreshStatus, which only writes display-only properties.
- // Never wire status broadcasts to a handler that touches text-input properties —
- // it clobbers in-progress typing every 10s. See coolify#6062 / #6354 / #9695.
- "echo-private:user.{$userId},DatabaseStatusChanged" => 'refreshStatus',
- "echo-private:team.{$teamId},ServiceChecked" => 'refreshStatus',
];
}
- public function refreshStatus(): void
- {
- $this->database->refresh();
- $this->dbUrl = $this->database->internal_db_url;
- $this->dbUrlPublic = $this->database->external_db_url;
- }
-
public function mount()
{
try {
@@ -101,8 +84,6 @@ protected function rules(): array
'publicPort' => 'nullable|integer|min:1|max:65535',
'publicPortTimeout' => 'nullable|integer|min:1',
'customDockerRunOptions' => 'nullable|string',
- 'dbUrl' => 'nullable|string',
- 'dbUrlPublic' => 'nullable|string',
'isLogDrainEnabled' => 'nullable|boolean',
];
}
@@ -142,9 +123,6 @@ public function syncData(bool $toModel = false)
$this->database->custom_docker_run_options = $this->customDockerRunOptions;
$this->database->is_log_drain_enabled = $this->isLogDrainEnabled;
$this->database->save();
-
- $this->dbUrl = $this->database->internal_db_url;
- $this->dbUrlPublic = $this->database->external_db_url;
} else {
$this->name = $this->database->name;
$this->description = $this->database->description;
@@ -157,8 +135,6 @@ public function syncData(bool $toModel = false)
$this->publicPortTimeout = $this->database->public_port_timeout;
$this->customDockerRunOptions = $this->database->custom_docker_run_options;
$this->isLogDrainEnabled = $this->database->is_log_drain_enabled;
- $this->dbUrl = $this->database->internal_db_url;
- $this->dbUrlPublic = $this->database->external_db_url;
}
}
@@ -207,6 +183,7 @@ public function instantSave()
StopDatabaseProxy::run($this->database);
$this->dispatch('success', 'Database is no longer publicly accessible.');
}
+ $this->dispatch('databaseUpdated');
} catch (\Throwable $e) {
$this->isPublic = ! $this->isPublic;
$this->syncData(true);
@@ -218,6 +195,7 @@ public function instantSave()
public function databaseProxyStopped()
{
$this->syncData();
+ $this->dispatch('databaseUpdated');
}
public function submit()
@@ -233,6 +211,7 @@ public function submit()
}
$this->syncData(true);
$this->dispatch('success', 'Database updated.');
+ $this->dispatch('databaseUpdated');
} catch (Exception $e) {
return handleError($e, $this);
} finally {
diff --git a/app/Livewire/Project/Database/Clickhouse/StatusInfo.php b/app/Livewire/Project/Database/Clickhouse/StatusInfo.php
new file mode 100644
index 000000000..51a3192fa
--- /dev/null
+++ b/app/Livewire/Project/Database/Clickhouse/StatusInfo.php
@@ -0,0 +1,31 @@
+currentTeam()->id;
return [
"echo-private:team.{$teamId},DatabaseProxyStopped" => 'databaseProxyStopped',
- // Broadcasts go to refreshStatus, which only writes display-only properties.
- // Never wire status broadcasts to a handler that touches text-input properties —
- // it clobbers in-progress typing every 10s. See coolify#6062 / #6354 / #9695.
- "echo-private:user.{$userId},DatabaseStatusChanged" => 'refreshStatus',
- "echo-private:team.{$teamId},ServiceChecked" => 'refreshStatus',
];
}
- public function refreshStatus(): void
- {
- $this->database->refresh();
- $this->dbUrl = $this->database->internal_db_url;
- $this->dbUrlPublic = $this->database->external_db_url;
- $this->certificateValidUntil = $this->database->sslCertificates()->first()?->valid_until;
- }
-
public function mount()
{
try {
@@ -84,12 +60,6 @@ public function mount()
return;
}
-
- $existingCert = $this->database->sslCertificates()->first();
-
- if ($existingCert) {
- $this->certificateValidUntil = $existingCert->valid_until;
- }
} catch (\Throwable $e) {
return handleError($e, $this);
}
@@ -109,10 +79,7 @@ protected function rules(): array
'publicPort' => 'nullable|integer|min:1|max:65535',
'publicPortTimeout' => 'nullable|integer|min:1',
'customDockerRunOptions' => 'nullable|string',
- 'dbUrl' => 'nullable|string',
- 'dbUrlPublic' => 'nullable|string',
'isLogDrainEnabled' => 'nullable|boolean',
- 'enable_ssl' => 'nullable|boolean',
];
}
@@ -148,11 +115,7 @@ public function syncData(bool $toModel = false)
$this->database->public_port_timeout = $this->publicPortTimeout ?: null;
$this->database->custom_docker_run_options = $this->customDockerRunOptions;
$this->database->is_log_drain_enabled = $this->isLogDrainEnabled;
- $this->database->enable_ssl = $this->enable_ssl;
$this->database->save();
-
- $this->dbUrl = $this->database->internal_db_url;
- $this->dbUrlPublic = $this->database->external_db_url;
} else {
$this->name = $this->database->name;
$this->description = $this->database->description;
@@ -164,9 +127,6 @@ public function syncData(bool $toModel = false)
$this->publicPortTimeout = $this->database->public_port_timeout;
$this->customDockerRunOptions = $this->database->custom_docker_run_options;
$this->isLogDrainEnabled = $this->database->is_log_drain_enabled;
- $this->enable_ssl = $this->database->enable_ssl;
- $this->dbUrl = $this->database->internal_db_url;
- $this->dbUrlPublic = $this->database->external_db_url;
}
}
@@ -215,6 +175,7 @@ public function instantSave()
StopDatabaseProxy::run($this->database);
$this->dispatch('success', 'Database is no longer publicly accessible.');
}
+ $this->dispatch('databaseUpdated');
} catch (\Throwable $e) {
$this->isPublic = ! $this->isPublic;
$this->syncData(true);
@@ -226,6 +187,7 @@ public function instantSave()
public function databaseProxyStopped()
{
$this->syncData();
+ $this->dispatch('databaseUpdated');
}
public function submit()
@@ -241,6 +203,7 @@ public function submit()
}
$this->syncData(true);
$this->dispatch('success', 'Database updated.');
+ $this->dispatch('databaseUpdated');
} catch (Exception $e) {
return handleError($e, $this);
} finally {
@@ -252,67 +215,6 @@ public function submit()
}
}
- public function instantSaveSSL()
- {
- try {
- $this->authorize('update', $this->database);
-
- $this->syncData(true);
- $this->dispatch('success', 'SSL configuration updated.');
- } catch (Exception $e) {
- return handleError($e, $this);
- }
- }
-
- public function regenerateSslCertificate()
- {
- try {
- $this->authorize('update', $this->database);
-
- $existingCert = $this->database->sslCertificates()->first();
-
- if (! $existingCert) {
- $this->dispatch('error', 'No existing SSL certificate found for this database.');
-
- return;
- }
-
- $server = $this->database->destination->server;
-
- $caCert = $server->sslCertificates()
- ->where('is_ca_certificate', true)
- ->first();
-
- if (! $caCert) {
- $server->generateCaCertificate();
- $caCert = $server->sslCertificates()->where('is_ca_certificate', true)->first();
- }
-
- if (! $caCert) {
- $this->dispatch('error', 'No CA certificate found for this database. Please generate a CA certificate for this server in the server/advanced page.');
-
- return;
- }
-
- SslHelper::generateSslCertificate(
- commonName: $existingCert->common_name,
- subjectAlternativeNames: $existingCert->subject_alternative_names ?? [],
- resourceType: $existingCert->resource_type,
- resourceId: $existingCert->resource_id,
- serverId: $existingCert->server_id,
- caCert: $caCert->ssl_certificate,
- caKey: $caCert->ssl_private_key,
- configurationDir: $existingCert->configuration_dir,
- mountPath: $existingCert->mount_path,
- isPemKeyFileRequired: true,
- );
-
- $this->dispatch('success', 'SSL certificates regenerated. Restart database to apply changes.');
- } catch (Exception $e) {
- handleError($e, $this);
- }
- }
-
public function refresh(): void
{
$this->database->refresh();
diff --git a/app/Livewire/Project/Database/Dragonfly/StatusInfo.php b/app/Livewire/Project/Database/Dragonfly/StatusInfo.php
new file mode 100644
index 000000000..baeb3d09f
--- /dev/null
+++ b/app/Livewire/Project/Database/Dragonfly/StatusInfo.php
@@ -0,0 +1,26 @@
+currentTeam()->id;
return [
"echo-private:team.{$teamId},DatabaseProxyStopped" => 'databaseProxyStopped',
- // Broadcasts go to refreshStatus, which only writes display-only properties.
- // Never wire status broadcasts to a handler that touches text-input properties —
- // it clobbers in-progress typing every 10s. See coolify#6062 / #6354 / #9695.
- "echo-private:user.{$userId},DatabaseStatusChanged" => 'refreshStatus',
- "echo-private:team.{$teamId},ServiceChecked" => 'refreshStatus',
];
}
- public function refreshStatus(): void
- {
- $this->database->refresh();
- $this->dbUrl = $this->database->internal_db_url;
- $this->dbUrlPublic = $this->database->external_db_url;
- $this->certificateValidUntil = $this->database->sslCertificates()->first()?->valid_until;
- }
-
public function mount()
{
try {
@@ -86,12 +62,6 @@ public function mount()
return;
}
-
- $existingCert = $this->database->sslCertificates()->first();
-
- if ($existingCert) {
- $this->certificateValidUntil = $existingCert->valid_until;
- }
} catch (\Throwable $e) {
return handleError($e, $this);
}
@@ -99,7 +69,7 @@ public function mount()
protected function rules(): array
{
- $baseRules = [
+ return [
'name' => ValidationPatterns::nameRules(),
'description' => ValidationPatterns::descriptionRules(),
'keydbConf' => 'nullable|string',
@@ -112,13 +82,8 @@ protected function rules(): array
'publicPort' => 'nullable|integer|min:1|max:65535',
'publicPortTimeout' => 'nullable|integer|min:1',
'customDockerRunOptions' => 'nullable|string',
- 'dbUrl' => 'nullable|string',
- 'dbUrlPublic' => 'nullable|string',
'isLogDrainEnabled' => 'nullable|boolean',
- 'enable_ssl' => 'boolean',
];
-
- return $baseRules;
}
protected function messages(): array
@@ -154,11 +119,7 @@ public function syncData(bool $toModel = false)
$this->database->public_port_timeout = $this->publicPortTimeout ?: null;
$this->database->custom_docker_run_options = $this->customDockerRunOptions;
$this->database->is_log_drain_enabled = $this->isLogDrainEnabled;
- $this->database->enable_ssl = $this->enable_ssl;
$this->database->save();
-
- $this->dbUrl = $this->database->internal_db_url;
- $this->dbUrlPublic = $this->database->external_db_url;
} else {
$this->name = $this->database->name;
$this->description = $this->database->description;
@@ -171,9 +132,6 @@ public function syncData(bool $toModel = false)
$this->publicPortTimeout = $this->database->public_port_timeout;
$this->customDockerRunOptions = $this->database->custom_docker_run_options;
$this->isLogDrainEnabled = $this->database->is_log_drain_enabled;
- $this->enable_ssl = $this->database->enable_ssl;
- $this->dbUrl = $this->database->internal_db_url;
- $this->dbUrlPublic = $this->database->external_db_url;
}
}
@@ -222,6 +180,7 @@ public function instantSave()
StopDatabaseProxy::run($this->database);
$this->dispatch('success', 'Database is no longer publicly accessible.');
}
+ $this->dispatch('databaseUpdated');
} catch (\Throwable $e) {
$this->isPublic = ! $this->isPublic;
$this->syncData(true);
@@ -233,6 +192,7 @@ public function instantSave()
public function databaseProxyStopped()
{
$this->syncData();
+ $this->dispatch('databaseUpdated');
}
public function submit()
@@ -248,6 +208,7 @@ public function submit()
}
$this->syncData(true);
$this->dispatch('success', 'Database updated.');
+ $this->dispatch('databaseUpdated');
} catch (Exception $e) {
return handleError($e, $this);
} finally {
@@ -259,65 +220,6 @@ public function submit()
}
}
- public function instantSaveSSL()
- {
- try {
- $this->authorize('update', $this->database);
-
- $this->syncData(true);
- $this->dispatch('success', 'SSL configuration updated.');
- } catch (Exception $e) {
- return handleError($e, $this);
- }
- }
-
- public function regenerateSslCertificate()
- {
- try {
- $this->authorize('update', $this->database);
-
- $existingCert = $this->database->sslCertificates()->first();
-
- if (! $existingCert) {
- $this->dispatch('error', 'No existing SSL certificate found for this database.');
-
- return;
- }
-
- $caCert = $this->server->sslCertificates()
- ->where('is_ca_certificate', true)
- ->first();
-
- if (! $caCert) {
- $this->server->generateCaCertificate();
- $caCert = $this->server->sslCertificates()->where('is_ca_certificate', true)->first();
- }
-
- if (! $caCert) {
- $this->dispatch('error', 'No CA certificate found for this database. Please generate a CA certificate for this server in the server/advanced page.');
-
- return;
- }
-
- SslHelper::generateSslCertificate(
- commonName: $existingCert->common_name,
- subjectAlternativeNames: $existingCert->subject_alternative_names ?? [],
- resourceType: $existingCert->resource_type,
- resourceId: $existingCert->resource_id,
- serverId: $existingCert->server_id,
- caCert: $caCert->ssl_certificate,
- caKey: $caCert->ssl_private_key,
- configurationDir: $existingCert->configuration_dir,
- mountPath: $existingCert->mount_path,
- isPemKeyFileRequired: true,
- );
-
- $this->dispatch('success', 'SSL certificates regenerated. Restart database to apply changes.');
- } catch (Exception $e) {
- handleError($e, $this);
- }
- }
-
public function refresh(): void
{
$this->database->refresh();
diff --git a/app/Livewire/Project/Database/Keydb/StatusInfo.php b/app/Livewire/Project/Database/Keydb/StatusInfo.php
new file mode 100644
index 000000000..1e87461cd
--- /dev/null
+++ b/app/Livewire/Project/Database/Keydb/StatusInfo.php
@@ -0,0 +1,26 @@
+currentTeam()->id;
-
- return [
- // Broadcasts go to refreshStatus, which only writes display-only properties.
- // Never wire status broadcasts to a handler that touches text-input properties —
- // it clobbers in-progress typing every 10s. See coolify#6062 / #6354 / #9695.
- "echo-private:user.{$userId},DatabaseStatusChanged" => 'refreshStatus',
- "echo-private:team.{$teamId},ServiceChecked" => 'refreshStatus',
- ];
- }
-
- public function refreshStatus(): void
- {
- $this->database->refresh();
- $this->db_url = $this->database->internal_db_url;
- $this->db_url_public = $this->database->external_db_url;
- $this->certificateValidUntil = $this->database->sslCertificates()->first()?->valid_until;
- }
-
protected function rules(): array
{
return [
@@ -105,7 +72,6 @@ protected function rules(): array
'publicPortTimeout' => 'nullable|integer|min:1',
'isLogDrainEnabled' => 'nullable|boolean',
'customDockerRunOptions' => 'nullable',
- 'enableSsl' => 'boolean',
];
}
@@ -144,7 +110,6 @@ protected function messages(): array
'publicPort' => 'Public Port',
'publicPortTimeout' => 'Public Port Timeout',
'customDockerRunOptions' => 'Custom Docker Options',
- 'enableSsl' => 'Enable SSL',
];
public function mount()
@@ -158,12 +123,6 @@ public function mount()
return;
}
-
- $existingCert = $this->database->sslCertificates()->first();
-
- if ($existingCert) {
- $this->certificateValidUntil = $existingCert->valid_until;
- }
} catch (Exception $e) {
return handleError($e, $this);
}
@@ -187,11 +146,7 @@ public function syncData(bool $toModel = false)
$this->database->public_port_timeout = $this->publicPortTimeout ?: null;
$this->database->is_log_drain_enabled = $this->isLogDrainEnabled;
$this->database->custom_docker_run_options = $this->customDockerRunOptions;
- $this->database->enable_ssl = $this->enableSsl;
$this->database->save();
-
- $this->db_url = $this->database->internal_db_url;
- $this->db_url_public = $this->database->external_db_url;
} else {
$this->name = $this->database->name;
$this->description = $this->database->description;
@@ -207,9 +162,6 @@ public function syncData(bool $toModel = false)
$this->publicPortTimeout = $this->database->public_port_timeout;
$this->isLogDrainEnabled = $this->database->is_log_drain_enabled;
$this->customDockerRunOptions = $this->database->custom_docker_run_options;
- $this->enableSsl = $this->database->enable_ssl;
- $this->db_url = $this->database->internal_db_url;
- $this->db_url_public = $this->database->external_db_url;
}
}
@@ -245,6 +197,7 @@ public function submit()
}
$this->syncData(true);
$this->dispatch('success', 'Database updated.');
+ $this->dispatch('databaseUpdated');
} catch (Exception $e) {
return handleError($e, $this);
} finally {
@@ -281,6 +234,7 @@ public function instantSave()
StopDatabaseProxy::run($this->database);
$this->dispatch('success', 'Database is no longer publicly accessible.');
}
+ $this->dispatch('databaseUpdated');
} catch (\Throwable $e) {
$this->isPublic = ! $this->isPublic;
$this->syncData(true);
@@ -289,63 +243,6 @@ public function instantSave()
}
}
- public function instantSaveSSL()
- {
- try {
- $this->authorize('update', $this->database);
-
- $this->syncData(true);
- $this->dispatch('success', 'SSL configuration updated.');
- } catch (Exception $e) {
- return handleError($e, $this);
- }
- }
-
- public function regenerateSslCertificate()
- {
- try {
- $this->authorize('update', $this->database);
-
- $existingCert = $this->database->sslCertificates()->first();
-
- if (! $existingCert) {
- $this->dispatch('error', 'No existing SSL certificate found for this database.');
-
- return;
- }
-
- $caCert = $this->server->sslCertificates()->where('is_ca_certificate', true)->first();
-
- if (! $caCert) {
- $this->server->generateCaCertificate();
- $caCert = $this->server->sslCertificates()->where('is_ca_certificate', true)->first();
- }
-
- if (! $caCert) {
- $this->dispatch('error', 'No CA certificate found for this database. Please generate a CA certificate for this server in the server/advanced page.');
-
- return;
- }
-
- SslHelper::generateSslCertificate(
- commonName: $existingCert->common_name,
- subjectAlternativeNames: $existingCert->subject_alternative_names ?? [],
- resourceType: $existingCert->resource_type,
- resourceId: $existingCert->resource_id,
- serverId: $existingCert->server_id,
- caCert: $caCert->ssl_certificate,
- caKey: $caCert->ssl_private_key,
- configurationDir: $existingCert->configuration_dir,
- mountPath: $existingCert->mount_path,
- isPemKeyFileRequired: true,
- );
-
- $this->dispatch('success', 'SSL certificates have been regenerated. Please restart the database for changes to take effect.');
- } catch (Exception $e) {
- return handleError($e, $this);
- }
- }
-
public function refresh(): void
{
$this->database->refresh();
diff --git a/app/Livewire/Project/Database/Mariadb/StatusInfo.php b/app/Livewire/Project/Database/Mariadb/StatusInfo.php
new file mode 100644
index 000000000..c6fda37b6
--- /dev/null
+++ b/app/Livewire/Project/Database/Mariadb/StatusInfo.php
@@ -0,0 +1,21 @@
+currentTeam()->id;
-
- return [
- // Broadcasts go to refreshStatus, which only writes display-only properties.
- // Never wire status broadcasts to a handler that touches text-input properties —
- // it clobbers in-progress typing every 10s. See coolify#6062 / #6354 / #9695.
- "echo-private:user.{$userId},DatabaseStatusChanged" => 'refreshStatus',
- "echo-private:team.{$teamId},ServiceChecked" => 'refreshStatus',
- ];
- }
-
- public function refreshStatus(): void
- {
- $this->database->refresh();
- $this->db_url = $this->database->internal_db_url;
- $this->db_url_public = $this->database->external_db_url;
- $this->certificateValidUntil = $this->database->sslCertificates()->first()?->valid_until;
- }
-
protected function rules(): array
{
return [
@@ -102,8 +67,6 @@ protected function rules(): array
'publicPortTimeout' => 'nullable|integer|min:1',
'isLogDrainEnabled' => 'nullable|boolean',
'customDockerRunOptions' => 'nullable',
- 'enableSsl' => 'boolean',
- 'sslMode' => 'nullable|string|in:allow,prefer,require,verify-full',
];
}
@@ -123,7 +86,6 @@ protected function messages(): array
'publicPort.max' => 'The Public Port must not exceed 65535.',
'publicPortTimeout.integer' => 'The Public Port Timeout must be an integer.',
'publicPortTimeout.min' => 'The Public Port Timeout must be at least 1.',
- 'sslMode.in' => 'The SSL Mode must be one of: allow, prefer, require, verify-full.',
]
);
}
@@ -141,8 +103,6 @@ protected function messages(): array
'publicPort' => 'Public Port',
'publicPortTimeout' => 'Public Port Timeout',
'customDockerRunOptions' => 'Custom Docker Run Options',
- 'enableSsl' => 'Enable SSL',
- 'sslMode' => 'SSL Mode',
];
public function mount()
@@ -156,12 +116,6 @@ public function mount()
return;
}
-
- $existingCert = $this->database->sslCertificates()->first();
-
- if ($existingCert) {
- $this->certificateValidUntil = $existingCert->valid_until;
- }
} catch (Exception $e) {
return handleError($e, $this);
}
@@ -184,12 +138,7 @@ public function syncData(bool $toModel = false)
$this->database->public_port_timeout = $this->publicPortTimeout ?: null;
$this->database->is_log_drain_enabled = $this->isLogDrainEnabled;
$this->database->custom_docker_run_options = $this->customDockerRunOptions;
- $this->database->enable_ssl = $this->enableSsl;
- $this->database->ssl_mode = $this->sslMode;
$this->database->save();
-
- $this->db_url = $this->database->internal_db_url;
- $this->db_url_public = $this->database->external_db_url;
} else {
$this->name = $this->database->name;
$this->description = $this->database->description;
@@ -204,10 +153,6 @@ public function syncData(bool $toModel = false)
$this->publicPortTimeout = $this->database->public_port_timeout;
$this->isLogDrainEnabled = $this->database->is_log_drain_enabled;
$this->customDockerRunOptions = $this->database->custom_docker_run_options;
- $this->enableSsl = $this->database->enable_ssl;
- $this->sslMode = $this->database->ssl_mode;
- $this->db_url = $this->database->internal_db_url;
- $this->db_url_public = $this->database->external_db_url;
}
}
@@ -246,6 +191,7 @@ public function submit()
}
$this->syncData(true);
$this->dispatch('success', 'Database updated.');
+ $this->dispatch('databaseUpdated');
} catch (Exception $e) {
return handleError($e, $this);
} finally {
@@ -282,6 +228,7 @@ public function instantSave()
StopDatabaseProxy::run($this->database);
$this->dispatch('success', 'Database is no longer publicly accessible.');
}
+ $this->dispatch('databaseUpdated');
} catch (\Throwable $e) {
$this->isPublic = ! $this->isPublic;
$this->syncData(true);
@@ -290,68 +237,6 @@ public function instantSave()
}
}
- public function updatedSslMode()
- {
- $this->instantSaveSSL();
- }
-
- public function instantSaveSSL()
- {
- try {
- $this->authorize('update', $this->database);
-
- $this->syncData(true);
- $this->dispatch('success', 'SSL configuration updated.');
- } catch (Exception $e) {
- return handleError($e, $this);
- }
- }
-
- public function regenerateSslCertificate()
- {
- try {
- $this->authorize('update', $this->database);
-
- $existingCert = $this->database->sslCertificates()->first();
-
- if (! $existingCert) {
- $this->dispatch('error', 'No existing SSL certificate found for this database.');
-
- return;
- }
-
- $caCert = $this->server->sslCertificates()->where('is_ca_certificate', true)->first();
-
- if (! $caCert) {
- $this->server->generateCaCertificate();
- $caCert = $this->server->sslCertificates()->where('is_ca_certificate', true)->first();
- }
-
- if (! $caCert) {
- $this->dispatch('error', 'No CA certificate found for this database. Please generate a CA certificate for this server in the server/advanced page.');
-
- return;
- }
-
- SslHelper::generateSslCertificate(
- commonName: $existingCert->common_name,
- subjectAlternativeNames: $existingCert->subject_alternative_names ?? [],
- resourceType: $existingCert->resource_type,
- resourceId: $existingCert->resource_id,
- serverId: $existingCert->server_id,
- caCert: $caCert->ssl_certificate,
- caKey: $caCert->ssl_private_key,
- configurationDir: $existingCert->configuration_dir,
- mountPath: $existingCert->mount_path,
- isPemKeyFileRequired: true,
- );
-
- $this->dispatch('success', 'SSL certificates have been regenerated. Please restart the database for changes to take effect.');
- } catch (Exception $e) {
- return handleError($e, $this);
- }
- }
-
public function refresh(): void
{
$this->database->refresh();
diff --git a/app/Livewire/Project/Database/Mongodb/StatusInfo.php b/app/Livewire/Project/Database/Mongodb/StatusInfo.php
new file mode 100644
index 000000000..a92a682c9
--- /dev/null
+++ b/app/Livewire/Project/Database/Mongodb/StatusInfo.php
@@ -0,0 +1,51 @@
+ ['title' => 'Allow insecure connections', 'label' => 'allow (insecure)'],
+ 'prefer' => ['title' => 'Prefer secure connections', 'label' => 'prefer (secure)'],
+ 'require' => ['title' => 'Require secure connections', 'label' => 'require (secure)'],
+ 'verify-full' => ['title' => 'Verify full certificate', 'label' => 'verify-full (secure)'],
+ ];
+ }
+
+ protected function sslModeHelper(): string
+ {
+ return 'Choose the SSL verification mode for MongoDB connections';
+ }
+
+ protected function afterRefresh(): void
+ {
+ $this->sslMode = $this->database->ssl_mode;
+ }
+
+ protected function applyExtraSslAttributes(): void
+ {
+ $this->database->ssl_mode = $this->sslMode;
+ }
+
+ public function updatedSslMode(): void
+ {
+ $this->instantSaveSSL();
+ }
+}
diff --git a/app/Livewire/Project/Database/Mysql/General.php b/app/Livewire/Project/Database/Mysql/General.php
index 6e1e55b3f..6b88d735d 100644
--- a/app/Livewire/Project/Database/Mysql/General.php
+++ b/app/Livewire/Project/Database/Mysql/General.php
@@ -4,14 +4,11 @@
use App\Actions\Database\StartDatabaseProxy;
use App\Actions\Database\StopDatabaseProxy;
-use App\Helpers\SslHelper;
use App\Models\Server;
use App\Models\StandaloneMysql;
use App\Support\ValidationPatterns;
-use Carbon\Carbon;
use Exception;
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
-use Illuminate\Support\Facades\Auth;
use Livewire\Component;
class General extends Component
@@ -50,38 +47,6 @@ class General extends Component
public ?string $customDockerRunOptions = null;
- public bool $enableSsl = false;
-
- public ?string $sslMode = null;
-
- public ?string $db_url = null;
-
- public ?string $db_url_public = null;
-
- public ?Carbon $certificateValidUntil = null;
-
- public function getListeners()
- {
- $userId = Auth::id();
- $teamId = Auth::user()->currentTeam()->id;
-
- return [
- // Broadcasts go to refreshStatus, which only writes display-only properties.
- // Never wire status broadcasts to a handler that touches text-input properties —
- // it clobbers in-progress typing every 10s. See coolify#6062 / #6354 / #9695.
- "echo-private:user.{$userId},DatabaseStatusChanged" => 'refreshStatus',
- "echo-private:team.{$teamId},ServiceChecked" => 'refreshStatus',
- ];
- }
-
- public function refreshStatus(): void
- {
- $this->database->refresh();
- $this->db_url = $this->database->internal_db_url;
- $this->db_url_public = $this->database->external_db_url;
- $this->certificateValidUntil = $this->database->sslCertificates()->first()?->valid_until;
- }
-
protected function rules(): array
{
return [
@@ -107,8 +72,6 @@ protected function rules(): array
'publicPortTimeout' => 'nullable|integer|min:1',
'isLogDrainEnabled' => 'nullable|boolean',
'customDockerRunOptions' => 'nullable',
- 'enableSsl' => 'boolean',
- 'sslMode' => 'nullable|string|in:PREFERRED,REQUIRED,VERIFY_CA,VERIFY_IDENTITY',
];
}
@@ -129,7 +92,6 @@ protected function messages(): array
'publicPort.max' => 'The Public Port must not exceed 65535.',
'publicPortTimeout.integer' => 'The Public Port Timeout must be an integer.',
'publicPortTimeout.min' => 'The Public Port Timeout must be at least 1.',
- 'sslMode.in' => 'The SSL Mode must be one of: PREFERRED, REQUIRED, VERIFY_CA, VERIFY_IDENTITY.',
]
);
}
@@ -148,8 +110,6 @@ protected function messages(): array
'publicPort' => 'Public Port',
'publicPortTimeout' => 'Public Port Timeout',
'customDockerRunOptions' => 'Custom Docker Run Options',
- 'enableSsl' => 'Enable SSL',
- 'sslMode' => 'SSL Mode',
];
public function mount()
@@ -163,12 +123,6 @@ public function mount()
return;
}
-
- $existingCert = $this->database->sslCertificates()->first();
-
- if ($existingCert) {
- $this->certificateValidUntil = $existingCert->valid_until;
- }
} catch (Exception $e) {
return handleError($e, $this);
}
@@ -192,12 +146,7 @@ public function syncData(bool $toModel = false)
$this->database->public_port_timeout = $this->publicPortTimeout ?: null;
$this->database->is_log_drain_enabled = $this->isLogDrainEnabled;
$this->database->custom_docker_run_options = $this->customDockerRunOptions;
- $this->database->enable_ssl = $this->enableSsl;
- $this->database->ssl_mode = $this->sslMode;
$this->database->save();
-
- $this->db_url = $this->database->internal_db_url;
- $this->db_url_public = $this->database->external_db_url;
} else {
$this->name = $this->database->name;
$this->description = $this->database->description;
@@ -213,10 +162,6 @@ public function syncData(bool $toModel = false)
$this->publicPortTimeout = $this->database->public_port_timeout;
$this->isLogDrainEnabled = $this->database->is_log_drain_enabled;
$this->customDockerRunOptions = $this->database->custom_docker_run_options;
- $this->enableSsl = $this->database->enable_ssl;
- $this->sslMode = $this->database->ssl_mode;
- $this->db_url = $this->database->internal_db_url;
- $this->db_url_public = $this->database->external_db_url;
}
}
@@ -252,6 +197,7 @@ public function submit()
}
$this->syncData(true);
$this->dispatch('success', 'Database updated.');
+ $this->dispatch('databaseUpdated');
} catch (Exception $e) {
return handleError($e, $this);
} finally {
@@ -288,6 +234,7 @@ public function instantSave()
StopDatabaseProxy::run($this->database);
$this->dispatch('success', 'Database is no longer publicly accessible.');
}
+ $this->dispatch('databaseUpdated');
} catch (\Throwable $e) {
$this->isPublic = ! $this->isPublic;
$this->syncData(true);
@@ -296,68 +243,6 @@ public function instantSave()
}
}
- public function updatedSslMode()
- {
- $this->instantSaveSSL();
- }
-
- public function instantSaveSSL()
- {
- try {
- $this->authorize('update', $this->database);
-
- $this->syncData(true);
- $this->dispatch('success', 'SSL configuration updated.');
- } catch (Exception $e) {
- return handleError($e, $this);
- }
- }
-
- public function regenerateSslCertificate()
- {
- try {
- $this->authorize('update', $this->database);
-
- $existingCert = $this->database->sslCertificates()->first();
-
- if (! $existingCert) {
- $this->dispatch('error', 'No existing SSL certificate found for this database.');
-
- return;
- }
-
- $caCert = $this->server->sslCertificates()->where('is_ca_certificate', true)->first();
-
- if (! $caCert) {
- $this->server->generateCaCertificate();
- $caCert = $this->server->sslCertificates()->where('is_ca_certificate', true)->first();
- }
-
- if (! $caCert) {
- $this->dispatch('error', 'No CA certificate found for this database. Please generate a CA certificate for this server in the server/advanced page.');
-
- return;
- }
-
- SslHelper::generateSslCertificate(
- commonName: $existingCert->common_name,
- subjectAlternativeNames: $existingCert->subject_alternative_names ?? [],
- resourceType: $existingCert->resource_type,
- resourceId: $existingCert->resource_id,
- serverId: $existingCert->server_id,
- caCert: $caCert->ssl_certificate,
- caKey: $caCert->ssl_private_key,
- configurationDir: $existingCert->configuration_dir,
- mountPath: $existingCert->mount_path,
- isPemKeyFileRequired: true,
- );
-
- $this->dispatch('success', 'SSL certificates have been regenerated. Please restart the database for changes to take effect.');
- } catch (Exception $e) {
- return handleError($e, $this);
- }
- }
-
public function refresh(): void
{
$this->database->refresh();
diff --git a/app/Livewire/Project/Database/Mysql/StatusInfo.php b/app/Livewire/Project/Database/Mysql/StatusInfo.php
new file mode 100644
index 000000000..5fbbc1583
--- /dev/null
+++ b/app/Livewire/Project/Database/Mysql/StatusInfo.php
@@ -0,0 +1,51 @@
+ ['title' => 'Prefer secure connections', 'label' => 'Prefer (secure)'],
+ 'REQUIRED' => ['title' => 'Require secure connections', 'label' => 'Require (secure)'],
+ 'VERIFY_CA' => ['title' => 'Verify CA certificate', 'label' => 'Verify CA (secure)'],
+ 'VERIFY_IDENTITY' => ['title' => 'Verify full certificate', 'label' => 'Verify Full (secure)'],
+ ];
+ }
+
+ protected function sslModeHelper(): string
+ {
+ return 'Choose the SSL verification mode for MySQL connections';
+ }
+
+ protected function afterRefresh(): void
+ {
+ $this->sslMode = $this->database->ssl_mode;
+ }
+
+ protected function applyExtraSslAttributes(): void
+ {
+ $this->database->ssl_mode = $this->sslMode;
+ }
+
+ public function updatedSslMode(): void
+ {
+ $this->instantSaveSSL();
+ }
+}
diff --git a/app/Livewire/Project/Database/Postgresql/General.php b/app/Livewire/Project/Database/Postgresql/General.php
index 1b36ac28a..4e89e8b62 100644
--- a/app/Livewire/Project/Database/Postgresql/General.php
+++ b/app/Livewire/Project/Database/Postgresql/General.php
@@ -4,14 +4,11 @@
use App\Actions\Database\StartDatabaseProxy;
use App\Actions\Database\StopDatabaseProxy;
-use App\Helpers\SslHelper;
use App\Models\Server;
use App\Models\StandalonePostgresql;
use App\Support\ValidationPatterns;
-use Carbon\Carbon;
use Exception;
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
-use Illuminate\Support\Facades\Auth;
use Livewire\Component;
class General extends Component
@@ -54,43 +51,14 @@ class General extends Component
public ?string $customDockerRunOptions = null;
- public bool $enableSsl = false;
-
- public ?string $sslMode = null;
-
public string $new_filename;
public string $new_content;
- public ?string $db_url = null;
-
- public ?string $db_url_public = null;
-
- public ?Carbon $certificateValidUntil = null;
-
- public function getListeners()
- {
- $userId = Auth::id();
- $teamId = Auth::user()->currentTeam()->id;
-
- return [
- // Broadcasts go to refreshStatus, which only writes display-only properties.
- // Never wire status broadcasts to a handler that touches text-input properties —
- // it clobbers in-progress typing every 10s. See coolify#6062 / #6354 / #9695.
- "echo-private:user.{$userId},DatabaseStatusChanged" => 'refreshStatus',
- "echo-private:team.{$teamId},ServiceChecked" => 'refreshStatus',
- 'save_init_script',
- 'delete_init_script',
- ];
- }
-
- public function refreshStatus(): void
- {
- $this->database->refresh();
- $this->db_url = $this->database->internal_db_url;
- $this->db_url_public = $this->database->external_db_url;
- $this->certificateValidUntil = $this->database->sslCertificates()->first()?->valid_until;
- }
+ protected $listeners = [
+ 'save_init_script',
+ 'delete_init_script',
+ ];
protected function rules(): array
{
@@ -117,8 +85,6 @@ protected function rules(): array
'publicPortTimeout' => 'nullable|integer|min:1',
'isLogDrainEnabled' => 'nullable|boolean',
'customDockerRunOptions' => 'nullable',
- 'enableSsl' => 'boolean',
- 'sslMode' => 'nullable|string|in:allow,prefer,require,verify-ca,verify-full',
];
}
@@ -138,7 +104,6 @@ protected function messages(): array
'publicPort.max' => 'The Public Port must not exceed 65535.',
'publicPortTimeout.integer' => 'The Public Port Timeout must be an integer.',
'publicPortTimeout.min' => 'The Public Port Timeout must be at least 1.',
- 'sslMode.in' => 'The SSL Mode must be one of: allow, prefer, require, verify-ca, verify-full.',
]
);
}
@@ -159,8 +124,6 @@ protected function messages(): array
'publicPort' => 'Public Port',
'publicPortTimeout' => 'Public Port Timeout',
'customDockerRunOptions' => 'Custom Docker Run Options',
- 'enableSsl' => 'Enable SSL',
- 'sslMode' => 'SSL Mode',
];
public function mount()
@@ -174,12 +137,6 @@ public function mount()
return;
}
-
- $existingCert = $this->database->sslCertificates()->first();
-
- if ($existingCert) {
- $this->certificateValidUntil = $existingCert->valid_until;
- }
} catch (Exception $e) {
return handleError($e, $this);
}
@@ -205,12 +162,7 @@ public function syncData(bool $toModel = false)
$this->database->public_port_timeout = $this->publicPortTimeout ?: null;
$this->database->is_log_drain_enabled = $this->isLogDrainEnabled;
$this->database->custom_docker_run_options = $this->customDockerRunOptions;
- $this->database->enable_ssl = $this->enableSsl;
- $this->database->ssl_mode = $this->sslMode;
$this->database->save();
-
- $this->db_url = $this->database->internal_db_url;
- $this->db_url_public = $this->database->external_db_url;
} else {
$this->name = $this->database->name;
$this->description = $this->database->description;
@@ -228,10 +180,6 @@ public function syncData(bool $toModel = false)
$this->publicPortTimeout = $this->database->public_port_timeout;
$this->isLogDrainEnabled = $this->database->is_log_drain_enabled;
$this->customDockerRunOptions = $this->database->custom_docker_run_options;
- $this->enableSsl = $this->database->enable_ssl;
- $this->sslMode = $this->database->ssl_mode;
- $this->db_url = $this->database->internal_db_url;
- $this->db_url_public = $this->database->external_db_url;
}
}
@@ -254,68 +202,6 @@ public function instantSaveAdvanced()
}
}
- public function updatedSslMode()
- {
- $this->instantSaveSSL();
- }
-
- public function instantSaveSSL()
- {
- try {
- $this->authorize('update', $this->database);
-
- $this->syncData(true);
- $this->dispatch('success', 'SSL configuration updated.');
- } catch (Exception $e) {
- return handleError($e, $this);
- }
- }
-
- public function regenerateSslCertificate()
- {
- try {
- $this->authorize('update', $this->database);
-
- $existingCert = $this->database->sslCertificates()->first();
-
- if (! $existingCert) {
- $this->dispatch('error', 'No existing SSL certificate found for this database.');
-
- return;
- }
-
- $caCert = $this->server->sslCertificates()->where('is_ca_certificate', true)->first();
-
- if (! $caCert) {
- $this->server->generateCaCertificate();
- $caCert = $this->server->sslCertificates()->where('is_ca_certificate', true)->first();
- }
-
- if (! $caCert) {
- $this->dispatch('error', 'No CA certificate found for this database. Please generate a CA certificate for this server in the server/advanced page.');
-
- return;
- }
-
- SslHelper::generateSslCertificate(
- commonName: $existingCert->common_name,
- subjectAlternativeNames: $existingCert->subject_alternative_names ?? [],
- resourceType: $existingCert->resource_type,
- resourceId: $existingCert->resource_id,
- serverId: $existingCert->server_id,
- caCert: $caCert->ssl_certificate,
- caKey: $caCert->ssl_private_key,
- configurationDir: $existingCert->configuration_dir,
- mountPath: $existingCert->mount_path,
- isPemKeyFileRequired: true,
- );
-
- $this->dispatch('success', 'SSL certificates have been regenerated. Please restart the database for changes to take effect.');
- } catch (Exception $e) {
- return handleError($e, $this);
- }
- }
-
public function instantSave()
{
try {
@@ -341,6 +227,7 @@ public function instantSave()
StopDatabaseProxy::run($this->database);
$this->dispatch('success', 'Database is no longer publicly accessible.');
}
+ $this->dispatch('databaseUpdated');
} catch (\Throwable $e) {
$this->isPublic = ! $this->isPublic;
$this->syncData(true);
@@ -504,6 +391,7 @@ public function submit()
}
$this->syncData(true);
$this->dispatch('success', 'Database updated.');
+ $this->dispatch('databaseUpdated');
} catch (Exception $e) {
return handleError($e, $this);
} finally {
diff --git a/app/Livewire/Project/Database/Postgresql/StatusInfo.php b/app/Livewire/Project/Database/Postgresql/StatusInfo.php
new file mode 100644
index 000000000..cc27b61bb
--- /dev/null
+++ b/app/Livewire/Project/Database/Postgresql/StatusInfo.php
@@ -0,0 +1,52 @@
+ ['title' => 'Allow insecure connections', 'label' => 'allow (insecure)'],
+ 'prefer' => ['title' => 'Prefer secure connections', 'label' => 'prefer (secure)'],
+ 'require' => ['title' => 'Require secure connections', 'label' => 'require (secure)'],
+ 'verify-ca' => ['title' => 'Verify CA certificate', 'label' => 'verify-ca (secure)'],
+ 'verify-full' => ['title' => 'Verify full certificate', 'label' => 'verify-full (secure)'],
+ ];
+ }
+
+ protected function sslModeHelper(): string
+ {
+ return 'Choose the SSL verification mode for PostgreSQL connections';
+ }
+
+ protected function afterRefresh(): void
+ {
+ $this->sslMode = $this->database->ssl_mode;
+ }
+
+ protected function applyExtraSslAttributes(): void
+ {
+ $this->database->ssl_mode = $this->sslMode;
+ }
+
+ public function updatedSslMode(): void
+ {
+ $this->instantSaveSSL();
+ }
+}
diff --git a/app/Livewire/Project/Database/Redis/StatusInfo.php b/app/Livewire/Project/Database/Redis/StatusInfo.php
index 183ed936f..2e784e2c0 100644
--- a/app/Livewire/Project/Database/Redis/StatusInfo.php
+++ b/app/Livewire/Project/Database/Redis/StatusInfo.php
@@ -2,115 +2,20 @@
namespace App\Livewire\Project\Database\Redis;
-use App\Helpers\SslHelper;
use App\Models\StandaloneRedis;
-use Carbon\Carbon;
-use Exception;
+use App\Traits\HasDatabaseStatusInfo;
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
-use Illuminate\Support\Facades\Auth;
use Livewire\Component;
class StatusInfo extends Component
{
use AuthorizesRequests;
+ use HasDatabaseStatusInfo;
public StandaloneRedis $database;
- public bool $enableSsl = false;
-
- public ?Carbon $certificateValidUntil = null;
-
- public ?string $dbUrl = null;
-
- public ?string $dbUrlPublic = null;
-
- public function getListeners()
+ protected function databaseLabel(): string
{
- $userId = Auth::id();
- $teamId = Auth::user()->currentTeam()->id;
-
- return [
- "echo-private:user.{$userId},DatabaseStatusChanged" => 'refresh',
- "echo-private:team.{$teamId},ServiceChecked" => 'refresh',
- 'databaseUpdated' => 'refresh',
- ];
- }
-
- public function mount(): void
- {
- $this->refresh();
- }
-
- public function refresh(): void
- {
- $this->database->refresh();
- $this->enableSsl = (bool) $this->database->enable_ssl;
- $this->dbUrl = $this->database->internal_db_url;
- $this->dbUrlPublic = $this->database->external_db_url;
- $this->certificateValidUntil = $this->database->sslCertificates()->first()?->valid_until;
- }
-
- public function instantSaveSSL(): void
- {
- try {
- $this->authorize('update', $this->database);
- $this->database->enable_ssl = $this->enableSsl;
- $this->database->save();
- $this->dispatch('success', 'SSL configuration updated.');
- } catch (Exception $e) {
- handleError($e, $this);
- }
- }
-
- public function regenerateSslCertificate(): void
- {
- try {
- $this->authorize('update', $this->database);
-
- $existingCert = $this->database->sslCertificates()->first();
-
- if (! $existingCert) {
- $this->dispatch('error', 'No existing SSL certificate found for this database.');
-
- return;
- }
-
- $server = $this->database->destination->server;
- $caCert = $server->sslCertificates()->where('is_ca_certificate', true)->first();
-
- if (! $caCert) {
- $server->generateCaCertificate();
- $caCert = $server->sslCertificates()->where('is_ca_certificate', true)->first();
- }
-
- if (! $caCert) {
- $this->dispatch('error', 'No CA certificate found for this database. Please generate a CA certificate for this server in the server/advanced page.');
-
- return;
- }
-
- SslHelper::generateSslCertificate(
- commonName: $existingCert->common_name,
- subjectAlternativeNames: $existingCert->subject_alternative_names ?? [],
- resourceType: $existingCert->resource_type,
- resourceId: $existingCert->resource_id,
- serverId: $existingCert->server_id,
- caCert: $caCert->ssl_certificate,
- caKey: $caCert->ssl_private_key,
- configurationDir: $existingCert->configuration_dir,
- mountPath: $existingCert->mount_path,
- isPemKeyFileRequired: true,
- );
-
- $this->refresh();
- $this->dispatch('success', 'SSL certificates regenerated. Restart database to apply changes.');
- } catch (Exception $e) {
- handleError($e, $this);
- }
- }
-
- public function render()
- {
- return view('livewire.project.database.redis.status-info');
+ return 'Redis';
}
}
diff --git a/app/Traits/HasDatabaseStatusInfo.php b/app/Traits/HasDatabaseStatusInfo.php
new file mode 100644
index 000000000..98c939b7e
--- /dev/null
+++ b/app/Traits/HasDatabaseStatusInfo.php
@@ -0,0 +1,164 @@
+currentTeam()->id;
+
+ return [
+ "echo-private:user.{$userId},DatabaseStatusChanged" => 'refresh',
+ "echo-private:team.{$teamId},ServiceChecked" => 'refresh',
+ 'databaseUpdated' => 'refresh',
+ ];
+ }
+
+ public function mount(): void
+ {
+ $this->refresh();
+ }
+
+ public function refresh(): void
+ {
+ $this->database->refresh();
+ $this->dbUrl = $this->database->internal_db_url;
+ $this->dbUrlPublic = $this->database->external_db_url;
+ if ($this->supportsSsl()) {
+ $this->enableSsl = (bool) $this->database->enable_ssl;
+ $this->certificateValidUntil = $this->database->sslCertificates()->first()?->valid_until;
+ $this->afterRefresh();
+ }
+ }
+
+ /**
+ * Hook for subclasses with extra status-derived properties (e.g. sslMode).
+ */
+ protected function afterRefresh(): void {}
+
+ public function instantSaveSSL(): void
+ {
+ try {
+ $this->authorize('update', $this->database);
+ $this->database->enable_ssl = $this->enableSsl;
+ $this->applyExtraSslAttributes();
+ $this->database->save();
+ $this->dispatch('success', 'SSL configuration updated.');
+ } catch (Exception $e) {
+ handleError($e, $this);
+ }
+ }
+
+ /**
+ * Hook for subclasses with additional SSL columns to persist (e.g. ssl_mode).
+ */
+ protected function applyExtraSslAttributes(): void {}
+
+ public function regenerateSslCertificate(): void
+ {
+ try {
+ $this->authorize('update', $this->database);
+
+ $existingCert = $this->database->sslCertificates()->first();
+
+ if (! $existingCert) {
+ $this->dispatch('error', 'No existing SSL certificate found for this database.');
+
+ return;
+ }
+
+ $server = $this->database->destination->server;
+ $caCert = $server->sslCertificates()->where('is_ca_certificate', true)->first();
+
+ if (! $caCert) {
+ $server->generateCaCertificate();
+ $caCert = $server->sslCertificates()->where('is_ca_certificate', true)->first();
+ }
+
+ if (! $caCert) {
+ $this->dispatch('error', 'No CA certificate found for this database. Please generate a CA certificate for this server in the server/advanced page.');
+
+ return;
+ }
+
+ SslHelper::generateSslCertificate(
+ commonName: $existingCert->common_name,
+ subjectAlternativeNames: $existingCert->subject_alternative_names ?? [],
+ resourceType: $existingCert->resource_type,
+ resourceId: $existingCert->resource_id,
+ serverId: $existingCert->server_id,
+ caCert: $caCert->ssl_certificate,
+ caKey: $caCert->ssl_private_key,
+ configurationDir: $existingCert->configuration_dir,
+ mountPath: $existingCert->mount_path,
+ isPemKeyFileRequired: true,
+ );
+
+ $this->refresh();
+ $this->dispatch('success', 'SSL certificates regenerated. Restart database to apply changes.');
+ } catch (Exception $e) {
+ handleError($e, $this);
+ }
+ }
+
+ public function render()
+ {
+ return view('livewire.project.database.status-info', [
+ 'label' => $this->databaseLabel(),
+ 'supportsSsl' => $this->supportsSsl(),
+ 'sslModeOptions' => $this->sslModeOptions(),
+ 'sslModeHelper' => $this->sslModeHelper(),
+ 'showPublicUrlPlaceholder' => $this->showPublicUrlPlaceholder(),
+ 'isExited' => str($this->database->status)->contains('exited'),
+ ]);
+ }
+}
diff --git a/resources/views/components/database-status-info.blade.php b/resources/views/components/database-status-info.blade.php
new file mode 100644
index 000000000..a7c8dade1
--- /dev/null
+++ b/resources/views/components/database-status-info.blade.php
@@ -0,0 +1,94 @@
+@props([
+ 'database',
+ 'label',
+ 'dbUrl' => null,
+ 'dbUrlPublic' => null,
+ 'supportsSsl' => true,
+ 'enableSsl' => false,
+ 'sslMode' => null,
+ 'sslModeOptions' => null,
+ 'sslModeHelper' => null,
+ 'certificateValidUntil' => null,
+ 'isExited' => false,
+ 'showPublicUrlPlaceholder' => false,
+])
+
+@php
+ $urlHelper = 'If you change the user/password/port, this could be different. This is with the default values.';
+@endphp
+
+
+
+ @if ($dbUrlPublic)
+
+ @elseif ($showPublicUrlPlaceholder)
+
+ @endif
+
+ @if ($supportsSsl)
+
+
+
+
SSL Configuration
+ @if ($enableSsl && $certificateValidUntil)
+
+
+ @if ($enableSsl && $certificateValidUntil)
+
Valid until:
+ @if (now()->gt($certificateValidUntil))
+ {{ $certificateValidUntil->format('d.m.Y H:i:s') }} - Expired
+ @elseif(now()->addDays(30)->gt($certificateValidUntil))
+ {{ $certificateValidUntil->format('d.m.Y H:i:s') }} - Expiring
+ soon
+ @else
+ {{ $certificateValidUntil->format('d.m.Y H:i:s') }}
+ @endif
+
+ @endif
+
+
+ @if ($isExited)
+
+ @if ($sslModeOptions && $enableSsl)
+
+ @if ($isExited)
+
+ @foreach ($sslModeOptions as $value => $option)
+ {{ $option['label'] }}
+ @endforeach
+
+ @else
+
+ @foreach ($sslModeOptions as $value => $option)
+ {{ $option['label'] }}
+ @endforeach
+
+ @endif
+
+ @endif
+
+
+ @endif
+
Example 3000:5432,3002:5433"
canGate="update" :canResource="$database" />