From 490fd536fe95666f1373b917e04334d4b49ce7b9 Mon Sep 17 00:00:00 2001
From: Simon Leary <simon.leary42@proton.me>
Date: Tue, 9 Sep 2025 16:42:55 -0400
Subject: [PATCH 1/3] setup shutdown function

---
 resources/init.php                  | 16 +++-------------
 resources/lib/UnitySite.php         | 25 +++++++++++++++++++++++++
 test/functional/InvalidEPPNTest.php |  5 ++---
 3 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/resources/init.php b/resources/init.php
index c56c3d48..bf967b77 100644
--- a/resources/init.php
+++ b/resources/init.php
@@ -30,19 +30,7 @@
 $GITHUB = new UnityGithub();
 
 if (isset($_SERVER["REMOTE_USER"])) {  // Check if SSO is enabled on this page
-    try {
-        $SSO = UnitySSO::getSSO();
-    } catch (SSOException $e) {
-        $errorid = uniqid("sso-");
-        $eppn = $_SERVER["REMOTE_USER"];
-        UnitySite::errorLog("SSO Failure", "{$e} ($errorid)");
-        UnitySite::die(
-            "Invalid eppn: '$eppn'. Please contact support at "
-                . CONFIG["mail"]["support"]
-                . " (id: $errorid)",
-            true
-        );
-    }
+    $SSO = UnitySSO::getSSO();
     $_SESSION["SSO"] = $SSO;
 
     $OPERATOR = new UnityUser($SSO["user"], $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK);
@@ -76,3 +64,5 @@
 
 $LOC_HEADER = __DIR__ . "/templates/header.php";
 $LOC_FOOTER = __DIR__ . "/templates/footer.php";
+
+register_shutdown_function(array("UnityWebPortal\lib\UnitySite", "shutdown"));
diff --git a/resources/lib/UnitySite.php b/resources/lib/UnitySite.php
index 10b678fc..9681d6a5 100644
--- a/resources/lib/UnitySite.php
+++ b/resources/lib/UnitySite.php
@@ -59,6 +59,7 @@ public static function badRequest($message)
     {
         self::headerResponseCode(400, "bad request");
         self::errorLog("bad request", $message);
+        error_clear_last();
         self::die($message);
     }
 
@@ -66,9 +67,31 @@ public static function forbidden($message)
     {
         self::headerResponseCode(403, "forbidden");
         self::errorLog("forbidden", $message);
+        error_clear_last();
         self::die($message);
     }
 
+    // https://www.php.net/manual/en/function.register-shutdown-function.php
+    public static function shutdown()
+    {
+        if (!is_null($e = error_get_last())) {
+            self::headerResponseCode(500, "internal server error");
+            $errorid = uniqid();
+            $e["unity_error_id"] = $errorid;
+            self::errorLog("internal server error", json_encode($e));
+            echo "
+                <h1>An internal server error has occurred.</h1>
+                <p>Please notify a Unity admin. Error ID: $errorid.</p>
+            ";
+            // if content already printed, status code will be ignored and alert text may not be
+            // shown in the webpage in an obvious way, so make a popup
+            self::alert(
+                "An internal server error has occurred. Please notify a Unity admin. "
+                . "Error ID: $errorid."
+            );
+        }
+    }
+
     public static function arrayGetOrBadRequest(array $array, ...$keys)
     {
         $cursor = $array;
@@ -83,6 +106,8 @@ public static function arrayGetOrBadRequest(array $array, ...$keys)
         return $cursor;
     }
 
+    // in firefox, the user can disable alert/confirm/prompt after the 2nd or 3rd popup
+    // after I disable alerts, if I quit and reopen my browser, the alerts come back
     public static function alert(string $message)
     {
         // json_encode escapes quotes
diff --git a/test/functional/InvalidEPPNTest.php b/test/functional/InvalidEPPNTest.php
index 658a88e8..239d9d91 100644
--- a/test/functional/InvalidEPPNTest.php
+++ b/test/functional/InvalidEPPNTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use UnityWebPortal\lib\exceptions\PhpUnitNoDieException;
+use UnityWebPortal\lib\exceptions\SSOException;
 use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\Attributes\DataProvider;
 
@@ -27,8 +27,7 @@ public function testInitGetSSO(string $eppn, bool $is_valid): void
             session_id(uniqid());
         }
         if (!$is_valid) {
-            $this->expectException(PhpUnitNoDieException::class);
-            $this->expectExceptionMessageMatches("/.*Invalid eppn.*/");
+            $this->expectException(SSOException::class);
         }
         try {
             $_SERVER["REMOTE_USER"] = $eppn;

From 0f01529d74ca5f6781e87a7ed66f6446c95d727f Mon Sep 17 00:00:00 2001
From: Simon Leary <simon.leary42@proton.me>
Date: Wed, 10 Sep 2025 09:18:11 -0400
Subject: [PATCH 2/3] move to top

---
 resources/init.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/init.php b/resources/init.php
index bf967b77..c295a7c1 100644
--- a/resources/init.php
+++ b/resources/init.php
@@ -15,6 +15,8 @@
 use UnityWebPortal\lib\UnitySite;
 use UnityWebPortal\lib\exceptions\SSOException;
 
+register_shutdown_function(array("UnityWebPortal\lib\UnitySite", "shutdown"));
+
 session_start();
 
 $REDIS = new UnityRedis();
@@ -64,5 +66,3 @@
 
 $LOC_HEADER = __DIR__ . "/templates/header.php";
 $LOC_FOOTER = __DIR__ . "/templates/footer.php";
-
-register_shutdown_function(array("UnityWebPortal\lib\UnitySite", "shutdown"));

From 01928353c50973216790cdf729c3560a31155351 Mon Sep 17 00:00:00 2001
From: Simon Leary <simon.leary42@proton.me>
Date: Wed, 10 Sep 2025 16:25:27 -0400
Subject: [PATCH 3/3] include support email in error message

---
 resources/lib/UnitySite.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/resources/lib/UnitySite.php b/resources/lib/UnitySite.php
index 9681d6a5..578a41ea 100644
--- a/resources/lib/UnitySite.php
+++ b/resources/lib/UnitySite.php
@@ -81,13 +81,19 @@ public static function shutdown()
             self::errorLog("internal server error", json_encode($e));
             echo "
                 <h1>An internal server error has occurred.</h1>
-                <p>Please notify a Unity admin. Error ID: $errorid.</p>
+                <p>
+                    Please notify a Unity admin at "
+                    . CONFIG["mail"]["support"]
+                    . ". Error ID: $errorid.
+                </p>
             ";
             // if content already printed, status code will be ignored and alert text may not be
             // shown in the webpage in an obvious way, so make a popup
             self::alert(
-                "An internal server error has occurred. Please notify a Unity admin. "
-                . "Error ID: $errorid."
+                "An internal server error has occurred. "
+                . "Please notify a Unity admin at "
+                . CONFIG["mail"]["support"]
+                . ". Error ID: $errorid."
             );
         }
     }