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

use shared functions when possible

Browse Source
This commit is contained in:
peaklabs-dev
2024-09-17 14:47:02 +02:00
parent 2bc74c75e1
commit 175f4b9ae1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Models/PrivateKey.php
View File

@@ -43,7 +43,7 @@ class PrivateKey extends BaseModel
protected static function booted() protected static function booted()
{ {
static::saving(function ($key) { static::saving(function ($key) {
$key->private_key = rtrim($key->private_key) . "\n"; $key->private_key = formatPrivateKey($key->private_key);
if (!self::validatePrivateKey($key->private_key)) { if (!self::validatePrivateKey($key->private_key)) {
throw ValidationException::withMessages([ throw ValidationException::withMessages([
@@ -101,13 +101,13 @@ class PrivateKey extends BaseModel
$instance->rateLimit(10); $instance->rateLimit(10);
$name = generate_random_name(); $name = generate_random_name();
$description = 'Created by Coolify'; $description = 'Created by Coolify';
['private' => $privateKey, 'public' => $publicKey] = generateSSHKey($type === 'ed25519' ? 'ed25519' : 'rsa'); $keyPair = generateSSHKey($type === 'ed25519' ? 'ed25519' : 'rsa');
return [ return [
'name' => $name, 'name' => $name,
'description' => $description, 'description' => $description,
'private_key' => $privateKey, 'private_key' => $keyPair['private'],
'public_key' => $publicKey, 'public_key' => $keyPair['public'],
]; ];
} catch (\Throwable $e) { } catch (\Throwable $e) {
throw new \Exception("Failed to generate new {$type} key: " . $e->getMessage()); throw new \Exception("Failed to generate new {$type} key: " . $e->getMessage());