UnityHPC · simonLeary42 · Apr 25, 2025 · Apr 25, 2025 · Apr 25, 2025 · Apr 25, 2025
diff --git a/resources/init.php b/resources/init.php
@@ -13,6 +13,7 @@
 use UnityWebPortal\lib\UnityRedis;
 use UnityWebPortal\lib\UnityWebhook;
 use UnityWebPortal\lib\UnityGithub;
+use UnityWebPortal\lib\UnitySite;
 
 //
 // Initialize Session
@@ -125,6 +126,8 @@
     }
 }
 
+$SITE = new UnitySite();
+
 //
 // Define vars
 //

diff --git a/resources/lib/UnitySite.php b/resources/lib/UnitySite.php
@@ -6,15 +6,15 @@
 
 class UnitySite
 {
-    public static function redirect($destination)
+    public function redirect($destination)
     {
         if ($_SERVER["PHP_SELF"] != $destination) {
             header("Location: $destination");
             die("Redirect failed, click <a href='$destination'>here</a> to continue.");
         }
     }
 
-    public static function removeTrailingWhitespace($arr)
+    public function removeTrailingWhitespace($arr)
     {
         $out = array();
         foreach ($arr as $str) {
@@ -25,7 +25,7 @@ public static function removeTrailingWhitespace($arr)
         return $out;
     }
 
-    public static function testValidSSHKey($key_str)
+    public function testValidSSHKey($key_str)
     {
         // key loader still throws, these just mute warnings for phpunit
         // https://github.com/phpseclib/phpseclib/issues/2079

diff --git a/resources/templates/header.php b/resources/templates/header.php
@@ -1,10 +1,7 @@
 <?php
-
-use UnityWebPortal\lib\UnitySite;
-
 if (isset($SSO)) {
     if (!$_SESSION["user_exists"]) {
-        UnitySite::redirect($CONFIG["site"]["prefix"] . "/panel/new_account.php");
+        $SITE->redirect($CONFIG["site"]["prefix"] . "/panel/new_account.php");
     }
 }
 
@@ -119,7 +116,7 @@
     if (isset($_SESSION["is_admin"]) && $_SESSION["is_admin"]) {
         if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST["form_name"]) && $_POST["form_name"] == "clearView") {
             unset($_SESSION["viewUser"]);
-            UnitySite::redirect($CONFIG["site"]["prefix"] . "/admin/user-mgmt.php");
+            $SITE->redirect($CONFIG["site"]["prefix"] . "/admin/user-mgmt.php");
         }
 
         if (isset($_SESSION["viewUser"])) {
@@ -135,4 +132,4 @@
             echo "</div>";
         }
     }
-    ?>
+    ?>
diff --git a/webroot/admin/ajax/get_group_members.php b/webroot/admin/ajax/get_group_members.php
@@ -5,11 +5,11 @@
 use UnityWebPortal\lib\UnityGroup;
 
 if (!$USER->isAdmin()) {
-    die();
+    throw new Exception("access denied");
 }
 
 if (!isset($_GET["pi_uid"])) {
-    die("PI UID not set");
+    throw new Exception("PI UID not set");
 }
 
 $group = new UnityGroup($_GET["pi_uid"], $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK);

diff --git a/webroot/admin/ajax/get_page_contents.php b/webroot/admin/ajax/get_page_contents.php
@@ -3,11 +3,11 @@
 require_once __DIR__ . "/../../../resources/autoload.php";
 
 if (!$USER->isAdmin()) {
-    die();
+    throw new Exception("access denied");
 }
 
 if (!isset($_GET["pageid"])) {
-    die("Pageid not found");
+    throw new Exception("Pageid not defined");
 }
 
 $page = $SQL->getPage($_GET["pageid"]);

diff --git a/webroot/admin/content.php b/webroot/admin/content.php
@@ -3,7 +3,7 @@
 require_once __DIR__ . "/../../resources/autoload.php";
 
 if (!$USER->isAdmin()) {
-    die();
+    throw new Exception("access denied");
 }
 
 if ($_SERVER["REQUEST_METHOD"] == "POST") {

diff --git a/webroot/admin/notices.php b/webroot/admin/notices.php
@@ -3,7 +3,7 @@
 require_once __DIR__ . "/../../resources/autoload.php";
 
 if (!$USER->isAdmin()) {
-    die();
+    throw new Exception("access denied");
 }
 
 if ($_SERVER["REQUEST_METHOD"] == "POST") {

diff --git a/webroot/admin/pi-mgmt.php b/webroot/admin/pi-mgmt.php
@@ -6,7 +6,7 @@
 use UnityWebPortal\lib\UnityGroup;
 
 if (!$USER->isAdmin()) {
-    die();
+    throw new Exception("access denied");
 }
 
 if ($_SERVER["REQUEST_METHOD"] == "POST") {

diff --git a/webroot/admin/user-mgmt.php b/webroot/admin/user-mgmt.php
@@ -2,17 +2,15 @@
 
 require_once __DIR__ . "/../../resources/autoload.php";
 
-use UnityWebPortal\lib\UnitySite;
-
 if (!$USER->isAdmin()) {
-    die();
+    throw new Exception("access denied");
 }
 
 if ($_SERVER["REQUEST_METHOD"] == "POST") {
     switch ($_POST["form_name"]) {
         case "viewAsUser":
             $_SESSION["viewUser"] = $_POST["uid"];
-            UnitySite::redirect($CONFIG["site"]["prefix"] . "/panel");
+            $SITE->redirect($CONFIG["site"]["prefix"] . "/panel/account.php");
             break;
     }
 }

diff --git a/webroot/api/content/index.php b/webroot/api/content/index.php
@@ -11,7 +11,7 @@
 }
 
 if (!isset($_GET["content_name"])) {
-    die();
+    throw new Exception("content_name not set");
 }
 
 echo $SQL->getPage($_GET["content_name"])["content"];
diff --git a/webroot/js/ajax/ssh_validate.php b/webroot/js/ajax/ssh_validate.php
@@ -1,6 +1,5 @@
 <?php
 
 require_once __DIR__ . "/../../../resources/lib/UnitySite.php";
-require_once __DIR__ . "/../../../vendor/autoload.php";
 
-echo UnityWebPortal\lib\UnitySite::testValidSSHKey($_POST["key"]) ? "true" : "false";
+echo (new UnityWebPortal\lib\UnitySite())->testValidSSHKey($_POST["key"]) ? "true" : "false";
diff --git a/webroot/panel/account.php b/webroot/panel/account.php
@@ -2,8 +2,6 @@
 
 require_once __DIR__ . "/../../resources/autoload.php";
 
-use UnityWebPortal\lib\UnitySite;
-
 require_once $LOC_HEADER;
 
 $invalid_ssh_dialogue = "<script type='text/javascript'>
@@ -18,7 +16,7 @@
             switch ($_POST["add_type"]) {
                 case "paste":
                     $key = $_POST["key"];
-                    if (UnitySite::testValidSSHKey($key)) {
+                    if ($SITE->testValidSSHKey($key)) {
                         array_push($added_keys, $key);
                     } else {
                         echo $invalid_ssh_dialogue;
@@ -27,7 +25,7 @@
                 case "import":
                     $keyfile = $_FILES["keyfile"]["tmp_name"];
                     $key = file_get_contents($keyfile);
-                    if (UnitySite::testValidSSHKey($key)) {
+                    if ($SITE->testValidSSHKey($key)) {
                         array_push($added_keys, $key);
                     } else {
                         echo $invalid_ssh_dialogue;
@@ -40,15 +38,15 @@
                     $gh_user = $_POST["gh_user"];
                     $keys = $GITHUB->getSshPublicKeys($gh_user);
                     foreach ($keys as $key) {
-                        if (UnitySite::testValidSSHKey($key)) {
+                        if ($SITE->testValidSSHKey($key)) {
                             array_push($added_keys, $key);
                         }
                     }
                     break;
             }
 
             if (!empty($added_keys)) {
-                $added_keys = UnitySite::removeTrailingWhitespace($added_keys);
+                $added_keys = $SITE->removeTrailingWhitespace($added_keys);
                 $totalKeys = array_merge($USER->getSSHKeys(), $added_keys);
                 $USER->setSSHKeys($totalKeys, $OPERATOR);
             }

diff --git a/webroot/panel/ajax/get_group_members.php b/webroot/panel/ajax/get_group_members.php
@@ -5,7 +5,7 @@
 use UnityWebPortal\lib\UnityGroup;
 
 if (!isset($_GET["pi_uid"])) {
-    die("PI UID not set");
+    throw new Exception("PI UID not set");
 }
 
 $group = new UnityGroup($_GET["pi_uid"], $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK);
@@ -20,25 +20,23 @@
     }
 }
 
-if (!$found) {
-    die();
-}
-
-$count = count($members);
-foreach ($members as $key => $member) {
-    if ($member->getUID() == $group->getOwner()->getUID()) {
-        continue;
+if ($found) {
+    $count = count($members);
+    foreach ($members as $key => $member) {
+        if ($member->getUID() == $group->getOwner()->getUID()) {
+            continue;
+        }
+
+        if ($key >= $count - 1) {
+            echo "<tr class='expanded $key last'>";
+        } else {
+            echo "<tr class='expanded $key'>";
+        }
+
+        echo "<td>" . $member->getFullname() . "</td>";
+        echo "<td>" . $member->getUID() . "</td>";
+        echo "<td><a href='mailto:" . $member->getMail() . "'>" . $member->getMail() . "</a></td>";
+        echo "<td><input type='hidden' name='uid' value='" . $member->getUID() . "'></td>";
+        echo "</tr>";
     }
-
-    if ($key >= $count - 1) {
-        echo "<tr class='expanded $key last'>";
-    } else {
-        echo "<tr class='expanded $key'>";
-    }
-
-    echo "<td>" . $member->getFullname() . "</td>";
-    echo "<td>" . $member->getUID() . "</td>";
-    echo "<td><a href='mailto:" . $member->getMail() . "'>" . $member->getMail() . "</a></td>";
-    echo "<td><input type='hidden' name='uid' value='" . $member->getUID() . "'></td>";
-    echo "</tr>";
 }
diff --git a/webroot/panel/index.php b/webroot/panel/index.php
diff --git a/webroot/panel/modal/pi_search.php b/webroot/panel/modal/pi_search.php
@@ -4,34 +4,34 @@
 
 $search_query = $_GET["search"];  // Search is passed as a get var
 if (empty($search_query)) {
-    die("<span>No Results</span>");
-}
-
-$assocs = $LDAP->getAllPIGroups($SQL, $MAILER, $REDIS, $WEBHOOK);
+    echo "<span>No Results</span>";
+} else {
+    $assocs = $LDAP->getAllPIGroups($SQL, $MAILER, $REDIS, $WEBHOOK);
 
-$MAX_COUNT = 10;  // Max results of PI search
+    $MAX_COUNT = 10;  // Max results of PI search
 
-$out = array();
-foreach ($assocs as $assoc_obj) {
-    $assoc = $assoc_obj->getPIUID();
-    // loop through each association
-    if (strpos($assoc, $search_query) !== false) {
-        array_push($out, $assoc);
-        if (count($out) >= $MAX_COUNT) {
-            break;
-        }
-    }
-    $fn = strtolower($assoc_obj->getOwner()->getFullName());
-    if (strpos($fn, strtolower($search_query)) !== false) {
-        if (!in_array($assoc, $out)) {
+    $out = array();
+    foreach ($assocs as $assoc_obj) {
+        $assoc = $assoc_obj->getPIUID();
+        // loop through each association
+        if (strpos($assoc, $search_query) !== false) {
             array_push($out, $assoc);
             if (count($out) >= $MAX_COUNT) {
                 break;
             }
         }
+        $fn = strtolower($assoc_obj->getOwner()->getFullName());
+        if (strpos($fn, strtolower($search_query)) !== false) {
+            if (!in_array($assoc, $out)) {
+                array_push($out, $assoc);
+                if (count($out) >= $MAX_COUNT) {
+                    break;
+                }
+            }
+        }
     }
-}
 
-foreach ($out as $pi_acct) {
-    echo "<span>$pi_acct</span>";
+    foreach ($out as $pi_acct) {
+        echo "<span>$pi_acct</span>";
+    }
 }
diff --git a/webroot/panel/new_account.php b/webroot/panel/new_account.php
@@ -2,13 +2,12 @@
 
 require_once __DIR__ . "/../../resources/autoload.php";
 
-use UnityWebPortal\lib\UnitySite;
 use UnityWebPortal\lib\UnityGroup;
 
 require_once $LOC_HEADER;
 
 if ($USER->exists()) {
-    UnitySite::redirect($CONFIG["site"]["prefix"] . "/panel/index.php");  // Redirect if account already exists
+    $SITE->redirect($CONFIG["site"]["prefix"] . "/panel/index.php");  // Redirect if account already exists
 }
 
 if ($_SERVER["REQUEST_METHOD"] == "POST") {

diff --git a/webroot/panel/pi.php b/webroot/panel/pi.php
@@ -3,12 +3,11 @@
 require_once __DIR__ . "/../../resources/autoload.php";
 
 use UnityWebPortal\lib\UnityUser;
-use UnityWebPortal\lib\UnitySite;
 
 $group = $USER->getPIGroup();
 
 if (!$USER->isPI()) {
-    die();
+    throw new Exception("access denied");
 }
 
 if ($_SERVER["REQUEST_METHOD"] == "POST") {