From 5558b052f03c08df0648fd4af68662c09f31b676 Mon Sep 17 00:00:00 2001
From: Anshul Saha <anshulsaha15@gmail.com>
Date: Tue, 14 Feb 2023 18:57:04 -0500
Subject: [PATCH 1/9] added ajax call; updated account.php

---
 webroot/js/ajax/ssh_validate.php | 14 ++++++++++++++
 webroot/panel/account.php        | 20 ++++++++++++++++++--
 webroot/panel/modal/new_key.php  | 24 +++++++++++++++++++++++-
 3 files changed, 55 insertions(+), 3 deletions(-)
 create mode 100644 webroot/js/ajax/ssh_validate.php

diff --git a/webroot/js/ajax/ssh_validate.php b/webroot/js/ajax/ssh_validate.php
new file mode 100644
index 00000000..23987260
--- /dev/null
+++ b/webroot/js/ajax/ssh_validate.php
@@ -0,0 +1,14 @@
+<?php
+
+require "../../../resources/autoload.php";
+
+use phpseclib3\Crypt\PublicKeyLoader;
+
+try {
+    PublicKeyLoader::load($_POST['key'], $password = false);
+    echo "true";
+} catch (Exception $e) {
+    echo "false";
+}
+
+
diff --git a/webroot/panel/account.php b/webroot/panel/account.php
index bb4cdb6d..de6cf6a1 100644
--- a/webroot/panel/account.php
+++ b/webroot/panel/account.php
@@ -3,9 +3,13 @@
 require_once "../../resources/autoload.php";
 
 use UnityWebPortal\lib\UnitySite;
+use phpseclib3\Crypt\PublicKeyLoader;
 
 require_once $LOC_HEADER;
 
+$invalid_ssh_dialogue = 
+"<script type='text/javascript'>alert('Invalid SSH Key. Try again.');</script>";
+
 if ($_SERVER['REQUEST_METHOD'] == "POST") {
     switch ($_POST["form_type"]) {
         case "addKey":
@@ -13,10 +17,22 @@
 
             switch ($_POST["add_type"]) {
                 case "paste":
-                    array_push($added_keys, $_POST["key"]);
+                    try{
+                        PublicKeyLoader::load($_POST["key"], $password = false);
+                        array_push($added_keys, $_POST["key"]);
+                    } catch (Exception $e) {
+                        echo $invalid_ssh_dialogue;                        
+                    }
                     break;
                 case "import":
-                    array_push($added_keys, file_get_contents($_FILES['keyfile']['tmp_name']));
+                    $keyfile = $_FILES["keyfile"]["tmp_name"];
+                    $key = file_get_contents($keyfile);
+                    try{
+                        PublicKeyLoader::load($key, $password = false);
+                        array_push($added_keys, $key);
+                    } catch (Exception $e) {
+                        echo $invalid_ssh_dialogue;
+                    }
                     break;
                 case "generate":
                     array_push($added_keys, $_POST["gen_key"]);
diff --git a/webroot/panel/modal/new_key.php b/webroot/panel/modal/new_key.php
index 9f63d736..96ada521 100644
--- a/webroot/panel/modal/new_key.php
+++ b/webroot/panel/modal/new_key.php
@@ -32,7 +32,7 @@
     <div id="key_paste">
         <textarea placeholder="ssh-rsa AAARs1..." form="newKeyform" name="key"></textarea>
 
-        <input type="submit" value="Add Key">
+        <input type="submit" value="Add Key" id="add-key">
     </div>
 
     <div style="display: none;" id="key_import">
@@ -90,4 +90,26 @@
             }
         });
     });
+
+    $("textarea[name=key]").on("input", function() {
+        var key = $(this).val();
+        $.ajax({
+            url: "<?php echo $CONFIG["site"]["prefix"]; ?>/js/ajax/ssh_validate.php",
+            type: "POST",
+            data: {
+                key: key
+            },
+            success: function(result) {
+                const res = result.replace(key, "");
+                if (res == "true") {
+                    $("input[id=add-key]").prop("disabled", false);
+                    $("textarea[name=key]").css("box-shadow", "none");
+                } else {
+                    $("input[id=add-key]").prop("disabled", true);
+                    $("textarea[name=key]").css("box-shadow", "0 0 0 0.3rem rgba(220, 53, 69, 0.25)");
+                }
+            }
+        });
+    });
+
 </script>

From f41a73f1715887cf24fd307c357506956a8f97c9 Mon Sep 17 00:00:00 2001
From: Anshul Saha <anshulsaha15@gmail.com>
Date: Tue, 14 Feb 2023 19:08:21 -0500
Subject: [PATCH 2/9] cs fix

---
 webroot/js/ajax/ssh_validate.php |  2 --
 webroot/panel/account.php        | 11 ++++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/webroot/js/ajax/ssh_validate.php b/webroot/js/ajax/ssh_validate.php
index 23987260..7180defb 100644
--- a/webroot/js/ajax/ssh_validate.php
+++ b/webroot/js/ajax/ssh_validate.php
@@ -10,5 +10,3 @@
 } catch (Exception $e) {
     echo "false";
 }
-
-
diff --git a/webroot/panel/account.php b/webroot/panel/account.php
index de6cf6a1..3948a946 100644
--- a/webroot/panel/account.php
+++ b/webroot/panel/account.php
@@ -7,8 +7,9 @@
 
 require_once $LOC_HEADER;
 
-$invalid_ssh_dialogue = 
-"<script type='text/javascript'>alert('Invalid SSH Key. Try again.');</script>";
+$invalid_ssh_dialogue = "<script type='text/javascript'>
+alert('Invalid SSH Key. Try again.');
+</script>";
 
 if ($_SERVER['REQUEST_METHOD'] == "POST") {
     switch ($_POST["form_type"]) {
@@ -17,17 +18,17 @@
 
             switch ($_POST["add_type"]) {
                 case "paste":
-                    try{
+                    try {
                         PublicKeyLoader::load($_POST["key"], $password = false);
                         array_push($added_keys, $_POST["key"]);
                     } catch (Exception $e) {
-                        echo $invalid_ssh_dialogue;                        
+                        echo $invalid_ssh_dialogue;
                     }
                     break;
                 case "import":
                     $keyfile = $_FILES["keyfile"]["tmp_name"];
                     $key = file_get_contents($keyfile);
-                    try{
+                    try {
                         PublicKeyLoader::load($key, $password = false);
                         array_push($added_keys, $key);
                     } catch (Exception $e) {

From ada6d4df7128e0c669ca20ac82c4840a07cdc374 Mon Sep 17 00:00:00 2001
From: Anshul Saha <anshulsaha15@gmail.com>
Date: Wed, 15 Feb 2023 00:11:58 -0500
Subject: [PATCH 3/9] Update alert message for invalid key

Co-authored-by: Hakan Saplakoglu <hakansaplakog@gmail.com>
---
 webroot/panel/account.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webroot/panel/account.php b/webroot/panel/account.php
index 3948a946..6c185bdd 100644
--- a/webroot/panel/account.php
+++ b/webroot/panel/account.php
@@ -8,7 +8,7 @@
 require_once $LOC_HEADER;
 
 $invalid_ssh_dialogue = "<script type='text/javascript'>
-alert('Invalid SSH Key. Try again.');
+alert('Invalid SSH key. Please verify your public key file is valid.');
 </script>";
 
 if ($_SERVER['REQUEST_METHOD'] == "POST") {

From 005f0c22702e4025f1931c60e1c3b65dbd56edc4 Mon Sep 17 00:00:00 2001
From: Anshul Saha <anshulsaha15@gmail.com>
Date: Wed, 15 Feb 2023 00:20:48 -0500
Subject: [PATCH 4/9] created testvalidsshkey()

---
 webroot/panel/account.php | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/webroot/panel/account.php b/webroot/panel/account.php
index 6c185bdd..059f7aa6 100644
--- a/webroot/panel/account.php
+++ b/webroot/panel/account.php
@@ -11,6 +11,15 @@
 alert('Invalid SSH key. Please verify your public key file is valid.');
 </script>";
 
+function testValidSSHKey($key_str) {
+    try {
+        PublicKeyLoader::load($key_str, $password = false);
+        return true;
+    } catch (Exception $e) {
+        return false;
+    }
+}
+
 if ($_SERVER['REQUEST_METHOD'] == "POST") {
     switch ($_POST["form_type"]) {
         case "addKey":
@@ -18,20 +27,19 @@
 
             switch ($_POST["add_type"]) {
                 case "paste":
-                    try {
-                        PublicKeyLoader::load($_POST["key"], $password = false);
-                        array_push($added_keys, $_POST["key"]);
-                    } catch (Exception $e) {
+                    $key = $_POST["key"];
+                    if (testValidSSHKey($key)) {
+                        array_push($added_keys, $key);
+                    } else {
                         echo $invalid_ssh_dialogue;
                     }
                     break;
                 case "import":
                     $keyfile = $_FILES["keyfile"]["tmp_name"];
                     $key = file_get_contents($keyfile);
-                    try {
-                        PublicKeyLoader::load($key, $password = false);
+                    if (testValidSSHKey($key)) {
                         array_push($added_keys, $key);
-                    } catch (Exception $e) {
+                    } else {
                         echo $invalid_ssh_dialogue;
                     }
                     break;

From dc78863aa89097ff9c22f0e81fbf51f1424366c4 Mon Sep 17 00:00:00 2001
From: Anshul Saha <anshulsaha15@gmail.com>
Date: Wed, 15 Feb 2023 00:24:00 -0500
Subject: [PATCH 5/9] cs fix

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

diff --git a/webroot/panel/account.php b/webroot/panel/account.php
index 059f7aa6..c19209d5 100644
--- a/webroot/panel/account.php
+++ b/webroot/panel/account.php
@@ -11,7 +11,8 @@
 alert('Invalid SSH key. Please verify your public key file is valid.');
 </script>";
 
-function testValidSSHKey($key_str) {
+function testValidSSHKey($key_str) 
+{
     try {
         PublicKeyLoader::load($key_str, $password = false);
         return true;

From 8dc694f4280d45a0e0f4a7751663e0cd5e9e5212 Mon Sep 17 00:00:00 2001
From: Anshul Saha <anshulsaha15@gmail.com>
Date: Wed, 15 Feb 2023 00:25:45 -0500
Subject: [PATCH 6/9] cs fix (2)

---
 webroot/panel/account.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webroot/panel/account.php b/webroot/panel/account.php
index c19209d5..022d9e96 100644
--- a/webroot/panel/account.php
+++ b/webroot/panel/account.php
@@ -11,7 +11,7 @@
 alert('Invalid SSH key. Please verify your public key file is valid.');
 </script>";
 
-function testValidSSHKey($key_str) 
+function testValidSSHKey($key_str)
 {
     try {
         PublicKeyLoader::load($key_str, $password = false);

From ccbd6fd3af9e584666eb57cf11b3bbfd5bfe75c5 Mon Sep 17 00:00:00 2001
From: Anshul Saha <anshulsaha15@gmail.com>
Date: Wed, 15 Feb 2023 00:34:48 -0500
Subject: [PATCH 7/9] cs fix (3)

---
 webroot/panel/account.php | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/webroot/panel/account.php b/webroot/panel/account.php
index 022d9e96..521213b3 100644
--- a/webroot/panel/account.php
+++ b/webroot/panel/account.php
@@ -1,16 +1,7 @@
 <?php
 
-require_once "../../resources/autoload.php";
-
-use UnityWebPortal\lib\UnitySite;
 use phpseclib3\Crypt\PublicKeyLoader;
 
-require_once $LOC_HEADER;
-
-$invalid_ssh_dialogue = "<script type='text/javascript'>
-alert('Invalid SSH key. Please verify your public key file is valid.');
-</script>";
-
 function testValidSSHKey($key_str)
 {
     try {
@@ -21,6 +12,16 @@ function testValidSSHKey($key_str)
     }
 }
 
+require_once "../../resources/autoload.php";
+
+use UnityWebPortal\lib\UnitySite;
+
+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"]) {
         case "addKey":

From 74949ba65b81f1b9434370f918b6341dbd3fd9e6 Mon Sep 17 00:00:00 2001
From: Anshul Saha <anshulsaha15@gmail.com>
Date: Wed, 15 Feb 2023 10:52:46 -0500
Subject: [PATCH 8/9] shifted function to UnitySite.php

---
 resources/lib/UnitySite.php | 11 +++++++++++
 webroot/panel/account.php   | 16 ++--------------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/resources/lib/UnitySite.php b/resources/lib/UnitySite.php
index c888c662..875fc9e4 100644
--- a/resources/lib/UnitySite.php
+++ b/resources/lib/UnitySite.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace UnityWebPortal\lib;
+use phpseclib3\Crypt\PublicKeyLoader;
 
 class UnitySite
 {
@@ -50,4 +51,14 @@ public static function getConfig($conf_path)
         $arr = parse_ini_file($conf_path, true);
         return $arr;
     }
+
+    public static function testValidSSHKey($key_str)
+    {
+        try {
+            PublicKeyLoader::load($key_str);
+            return true;
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
 }
diff --git a/webroot/panel/account.php b/webroot/panel/account.php
index 521213b3..ac329252 100644
--- a/webroot/panel/account.php
+++ b/webroot/panel/account.php
@@ -1,17 +1,5 @@
 <?php
 
-use phpseclib3\Crypt\PublicKeyLoader;
-
-function testValidSSHKey($key_str)
-{
-    try {
-        PublicKeyLoader::load($key_str, $password = false);
-        return true;
-    } catch (Exception $e) {
-        return false;
-    }
-}
-
 require_once "../../resources/autoload.php";
 
 use UnityWebPortal\lib\UnitySite;
@@ -30,7 +18,7 @@ function testValidSSHKey($key_str)
             switch ($_POST["add_type"]) {
                 case "paste":
                     $key = $_POST["key"];
-                    if (testValidSSHKey($key)) {
+                    if (UnitySite::testValidSSHKey($key)) {
                         array_push($added_keys, $key);
                     } else {
                         echo $invalid_ssh_dialogue;
@@ -39,7 +27,7 @@ function testValidSSHKey($key_str)
                 case "import":
                     $keyfile = $_FILES["keyfile"]["tmp_name"];
                     $key = file_get_contents($keyfile);
-                    if (testValidSSHKey($key)) {
+                    if (UnitySite::testValidSSHKey($key)) {
                         array_push($added_keys, $key);
                     } else {
                         echo $invalid_ssh_dialogue;

From 36d6a0566fcd718d0b9ae7f8a46db1cd2a7323a0 Mon Sep 17 00:00:00 2001
From: Anshul Saha <anshulsaha15@gmail.com>
Date: Wed, 15 Feb 2023 10:54:49 -0500
Subject: [PATCH 9/9] cs fix

---
 resources/lib/UnitySite.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lib/UnitySite.php b/resources/lib/UnitySite.php
index 875fc9e4..10c334f9 100644
--- a/resources/lib/UnitySite.php
+++ b/resources/lib/UnitySite.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace UnityWebPortal\lib;
+
 use phpseclib3\Crypt\PublicKeyLoader;
 
 class UnitySite