From 22a1d3882eb59f43544d66732490ad0708adc5e9 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Wed, 3 Apr 2024 13:45:49 +0200
Subject: [PATCH] feat: able to make rsa/ed ssh keys

---
 app/Livewire/Security/PrivateKey/Create.php   | 13 ++++++++++-
 bootstrap/helpers/shared.php                  | 22 ++++++++++++++-----
 .../security/private-key/create.blade.php     | 10 +++++++--
 .../server/show-private-key.blade.php         | 10 ++++-----
 4 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/app/Livewire/Security/PrivateKey/Create.php b/app/Livewire/Security/PrivateKey/Create.php
index cd1c06568..30449b220 100644
--- a/app/Livewire/Security/PrivateKey/Create.php
+++ b/app/Livewire/Security/PrivateKey/Create.php
@@ -26,7 +26,7 @@ class Create extends Component
         'value' => 'private Key',
     ];
 
-    public function generateNewKey()
+    public function generateNewRSAKey()
     {
         try {
             $this->rateLimit(10);
@@ -37,6 +37,17 @@ public function generateNewKey()
             return handleError($e, $this);
         }
     }
+    public function generateNewEDKey()
+    {
+        try {
+            $this->rateLimit(10);
+            $this->name = generate_random_name();
+            $this->description = 'Created by Coolify';
+            ['private' => $this->value, 'public' => $this->publicKey] = generateSSHKey('ed25519');
+        } catch(\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
     public function updated($updateProperty)
     {
         if ($updateProperty === 'value') {
diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
index baee4ce15..458dbae85 100644
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -39,6 +39,7 @@
 use Lcobucci\JWT\Signer\Key\InMemory;
 use Lcobucci\JWT\Signer\Hmac\Sha256;
 use Lcobucci\JWT\Token\Builder;
+use phpseclib3\Crypt\EC;
 use Poliander\Cron\CronExpression;
 use Visus\Cuid2\Cuid2;
 use phpseclib3\Crypt\RSA;
@@ -165,13 +166,22 @@ function generate_random_name(?string $cuid = null): string
     }
     return Str::kebab("{$generator->getName()}-$cuid");
 }
-function generateSSHKey()
+function generateSSHKey(string $type = 'rsa')
 {
-    $key = RSA::createKey();
-    return [
-        'private' => $key->toString('PKCS1'),
-        'public' => $key->getPublicKey()->toString('OpenSSH', ['comment' => 'coolify-generated-ssh-key'])
-    ];
+    if ($type === 'rsa') {
+        $key = RSA::createKey();
+        return [
+            'private' => $key->toString('PKCS1'),
+            'public' => $key->getPublicKey()->toString('OpenSSH', ['comment' => 'coolify-generated-ssh-key'])
+        ];
+    } else if ($type === 'ed25519') {
+        $key = EC::createKey('Ed25519');
+        return [
+            'private' => $key->toString('OpenSSH'),
+            'public' => $key->getPublicKey()->toString('OpenSSH', ['comment' => 'coolify-generated-ssh-key'])
+        ];
+    }
+    throw new Exception('Invalid key type');
 }
 function formatPrivateKey(string $privateKey)
 {
diff --git a/resources/views/livewire/security/private-key/create.blade.php b/resources/views/livewire/security/private-key/create.blade.php
index d44e2c470..1bace9f3a 100644
--- a/resources/views/livewire/security/private-key/create.blade.php
+++ b/resources/views/livewire/security/private-key/create.blade.php
@@ -1,6 +1,12 @@
 <div>
-    {{-- <div class="subtitle">Private Keys are used to connect to your servers without passwords.</div> --}}
-    <x-forms.button class="mb-4" wire:click="generateNewKey">Generate new SSH key for me</x-forms.button>
+    <div class="pb-0 subtitle">
+    <div >Private Keys are used to connect to your servers without passwords.</div>
+    <div class="font-bold">You should not use passphrase protected keys.</div>
+    </div>
+    <div class="flex gap-2 mb-4">
+    <x-forms.button  wire:click="generateNewRSAKey">Generate new RSA SSH Key</x-forms.button>
+    <x-forms.button  wire:click="generateNewEDKey">Generate new ED25519 SSH Key</x-forms.button>
+    </div>
     <form class="flex flex-col gap-2" wire:submit='createPrivateKey'>
         <div class="flex gap-2">
             <x-forms.input id="name" label="Name" required />
diff --git a/resources/views/livewire/server/show-private-key.blade.php b/resources/views/livewire/server/show-private-key.blade.php
index ac52d601f..62b1c4614 100644
--- a/resources/views/livewire/server/show-private-key.blade.php
+++ b/resources/views/livewire/server/show-private-key.blade.php
@@ -26,12 +26,12 @@
     <h3 class="pb-4">Choose another Key</h3>
     <div class="grid grid-cols-3 gap-2">
         @forelse ($privateKeys as $private_key)
-        <div class="box group">
-            <div class="flex flex-col " wire:click='setPrivateKey({{ $private_key->id }})'>
-                <div class="box-title">{{ $private_key->name }}</div>
-                <div class="box-description">{{ $private_key->description }}</div>
+            <div class="box group" wire:click='setPrivateKey({{ $private_key->id }})'>
+                <div class="flex flex-col ">
+                    <div class="box-title">{{ $private_key->name }}</div>
+                    <div class="box-description">{{ $private_key->description }}</div>
+                </div>
             </div>
-        </div>
         @empty
             <div>No private keys found. </div>
         @endforelse