From 45fa73c57732079b97a65d5cdd76c4448bad1d9f Mon Sep 17 00:00:00 2001
From: Simon Leary <simon.leary42@proton.me>
Date: Fri, 26 Sep 2025 17:13:23 -0400
Subject: [PATCH 1/3] disable import button until file is uploaded

---
 webroot/panel/modal/new_key.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/webroot/panel/modal/new_key.php b/webroot/panel/modal/new_key.php
index c8909fe0..262354d7 100644
--- a/webroot/panel/modal/new_key.php
+++ b/webroot/panel/modal/new_key.php
@@ -37,8 +37,8 @@
 
     <div style="display: none;" id="key_import">
         <label for="keyfile">Select local file:</label>
-        <input type="file" id="keyfile" name="keyfile">
-        <input type="submit" value="Import Key">
+        <input type="file" id="keyfile" name="keyfile" />
+        <input type="submit" id="submit-keyfile" value="Import Key" disabled />
     </div>
 
     <div style="display: none;" id="key_generate">
@@ -116,4 +116,7 @@ function generateKey(type) {
         });
     });
 
+    $("#keyfile").on("change", function() {
+        $("#submit-keyfile")[0].disabled = !this.files.length;
+    })
 </script>

From 7efb049f93967e37efb28c7a472bf9dc00676f08 Mon Sep 17 00:00:00 2001
From: simonLeary42 <71396965+simonLeary42@users.noreply.github.com>
Date: Fri, 26 Sep 2025 17:22:37 -0400
Subject: [PATCH 2/3] Update webroot/panel/modal/new_key.php

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 webroot/panel/modal/new_key.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webroot/panel/modal/new_key.php b/webroot/panel/modal/new_key.php
index 262354d7..4499aae3 100644
--- a/webroot/panel/modal/new_key.php
+++ b/webroot/panel/modal/new_key.php
@@ -118,5 +118,5 @@ function generateKey(type) {
 
     $("#keyfile").on("change", function() {
         $("#submit-keyfile")[0].disabled = !this.files.length;
-    })
+    });
 </script>

From 553bf99a21d0a6a4fc2e63017f6c65b5027346eb Mon Sep 17 00:00:00 2001
From: Simon Leary <simon.leary42@proton.me>
Date: Mon, 29 Sep 2025 16:17:58 -0400
Subject: [PATCH 3/3] use badRequest instead of alert

---
 webroot/panel/account.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/webroot/panel/account.php b/webroot/panel/account.php
index f97a84b6..b31fdaee 100644
--- a/webroot/panel/account.php
+++ b/webroot/panel/account.php
@@ -32,7 +32,13 @@
                 $validKeys = array_filter($keys, "testValidSSHKey");
                 $USER->setSSHKeys(array_merge($USER->getSSHKeys(), $validKeys));
                 if (count($keys) != count($validKeys)) {
-                    UnityHTTPD::alert("invalid SSH key");
+                    UnityHTTPD::badRequest(
+                        "one more more invalid SSH keys were not added",
+                        data: [
+                            "keys_valid_added" => $validKeys,
+                            "keys_invalid_not_added" => array_diff($keys, $validKeys),
+                        ],
+                    );
                 }
             }
             break;