dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: changing private key manually won't trigger a notification

Browse Source
This commit is contained in:
Andras Bacsai
2024-10-30 10:01:58 +01:00
parent 491b228580
commit 7385d7a478
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Livewire/Server/ShowPrivateKey.php
View File

@@ -31,16 +31,16 @@ class ShowPrivateKey extends Component
$originalPrivateKeyId = $this->server->getOriginal('private_key_id'); $originalPrivateKeyId = $this->server->getOriginal('private_key_id');
try { try {
$this->server->update(['private_key_id' => $privateKeyId]); $this->server->update(['private_key_id' => $privateKeyId]);
['uptime' => $uptime, 'error' => $error] = $this->server->validateConnection(); ['uptime' => $uptime, 'error' => $error] = $this->server->validateConnection(justCheckingNewKey: true);
if ($uptime) { if ($uptime) {
$this->dispatch('success', 'Private key updated successfully.'); $this->dispatch('success', 'Private key updated successfully.');
} else { } else {
throw new \Exception('Server is not reachable.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/knowledge-base/server/openssh">documentation</a> for further help.<br><br>Error: '.$error); throw new \Exception($error);
} }
} catch (\Exception $e) { } catch (\Exception $e) {
$this->server->update(['private_key_id' => $originalPrivateKeyId]); $this->server->update(['private_key_id' => $originalPrivateKeyId]);
$this->server->validateConnection(); $this->server->validateConnection();
$this->dispatch('error', 'Failed to update private key: '.$e->getMessage()); $this->dispatch('error', $e->getMessage());
} finally { } finally {
$this->dispatch('refreshServerShow'); $this->dispatch('refreshServerShow');
$this->server->refresh(); $this->server->refresh();

5
app/Models/Server.php
View File

@@ -1057,7 +1057,7 @@ $schema://$host {
$this->team->notify(new Unreachable($this)); $this->team->notify(new Unreachable($this));
} }
public function validateConnection($isManualCheck = true) public function validateConnection(bool $isManualCheck = true, bool $justCheckingNewKey = false)
{ {
config()->set('constants.ssh.mux_enabled', ! $isManualCheck); config()->set('constants.ssh.mux_enabled', ! $isManualCheck);
@@ -1077,6 +1077,9 @@ $schema://$host {
return ['uptime' => true, 'error' => null]; return ['uptime' => true, 'error' => null];
} catch (\Throwable $e) { } catch (\Throwable $e) {
if ($justCheckingNewKey) {
return ['uptime' => false, 'error' => 'This key is not valid for this server.'];
}
if ($this->settings->is_reachable === true) { if ($this->settings->is_reachable === true) {
$this->settings->is_reachable = false; $this->settings->is_reachable = false;
$this->settings->save(); $this->settings->save();