From 880edc717bad1e80465f1988bad5291607d078af Mon Sep 17 00:00:00 2001
From: Simon Leary <simon.leary42@proton.me>
Date: Wed, 30 Apr 2025 16:23:10 -0400
Subject: [PATCH] update ssh key adding logic

---
 resources/lib/UnitySite.php | 21 ++++++++++-----
 webroot/panel/account.php   | 52 +++++++++++++------------------------
 2 files changed, 33 insertions(+), 40 deletions(-)

diff --git a/resources/lib/UnitySite.php b/resources/lib/UnitySite.php
index c8d89bcb..cb6a2b4d 100644
--- a/resources/lib/UnitySite.php
+++ b/resources/lib/UnitySite.php
@@ -67,15 +67,24 @@ public static function forbidden($message)
         self::die();
     }
 
-    public static function removeTrailingWhitespace($arr)
+    public static function arrayGetOrBadRequest(array $array, ...$keys)
     {
-        $out = array();
-        foreach ($arr as $str) {
-            $new_string = rtrim($str);
-            array_push($out, $new_string);
+        $cursor = $array;
+        $keysTraversed = [];
+        foreach ($keys as $key) {
+            array_push($keysTraversed, $key);
+            if (!isset($cursor[$key])) {
+                self::badRequest("array key not found: " . json_encode($keysTraversed));
+            }
+            $cursor = $cursor[$key];
         }
+        return $cursor;
+    }
 
-        return $out;
+    public static function alert(string $message)
+    {
+        // json_encode escapes quotes
+        echo "<script type='text/javascript'>alert(" . json_encode($message) . ");</script>";
     }
 
     public static function testValidSSHKey($key_str)
diff --git a/webroot/panel/account.php b/webroot/panel/account.php
index bcfd7198..d074ed26 100644
--- a/webroot/panel/account.php
+++ b/webroot/panel/account.php
@@ -6,51 +6,35 @@
 
 require_once $LOC_HEADER;
 
-$invalid_ssh_dialogue = "<script type='text/javascript'>
-alert('Invalid SSH key. Please verify your public key file is valid.');
-</script>";
-
 if ($_SERVER['REQUEST_METHOD'] == "POST") {
-    switch ($_POST["form_type"]) {
+    switch (UnitySite::arrayGetOrBadRequest($_POST, "form_type")) {
         case "addKey":
-            $added_keys = array();
-
-            switch ($_POST["add_type"]) {
+            $keys = array();
+            switch (UnitySite::arrayGetOrBadRequest($_POST, "add_type")) {
                 case "paste":
-                    $key = $_POST["key"];
-                    if (UnitySite::testValidSSHKey($key)) {
-                        array_push($added_keys, $key);
-                    } else {
-                        echo $invalid_ssh_dialogue;
-                    }
+                    array_push($keys, UnitySite::arrayGetOrBadRequest($_POST, "key"));
                     break;
                 case "import":
-                    $keyfile = $_FILES["keyfile"]["tmp_name"];
-                    $key = file_get_contents($keyfile);
-                    if (UnitySite::testValidSSHKey($key)) {
-                        array_push($added_keys, $key);
-                    } else {
-                        echo $invalid_ssh_dialogue;
-                    }
+                    $keyPath = UnitySite::arrayGetOrBadRequest($_FILES, "keyfile", "tmp_name");
+                    $key = file_get_contents($keyPath);
+                    array_push($keys, $key);
                     break;
                 case "generate":
-                    array_push($added_keys, $_POST["gen_key"]);
+                    array_push($keys, UnitySite::arrayGetOrBadRequest($_POST, "gen_key"));
                     break;
                 case "github":
-                    $gh_user = $_POST["gh_user"];
-                    $keys = $GITHUB->getSshPublicKeys($gh_user);
-                    foreach ($keys as $key) {
-                        if (UnitySite::testValidSSHKey($key)) {
-                            array_push($added_keys, $key);
-                        }
-                    }
+                    $githubUsername = UnitySite::arrayGetOrBadRequest($_POST, "gh_user");
+                    $githubKeys = $GITHUB->getSshPublicKeys($githubUsername);
+                    $keys = array_merge($keys, $githubKeys);
                     break;
             }
-
-            if (!empty($added_keys)) {
-                $added_keys = UnitySite::removeTrailingWhitespace($added_keys);
-                $totalKeys = array_merge($USER->getSSHKeys(), $added_keys);
-                $USER->setSSHKeys($totalKeys, $OPERATOR);
+            if (!empty($keys)) {
+                $keys = array_map("trim", $keys);
+                $validKeys = array_filter($keys, ["UnityWebPortal\lib\UnitySite", "testValidSSHKey"]);
+                $USER->setSSHKeys(array_merge($USER->getSSHKeys(), $validKeys));
+                if (count($keys) != count($validKeys)) {
+                    UnitySite::alert("invalid SSH key");
+                }
             }
             break;
         case "delKey":