From a998b8e22b2fd605583fcc6f455894563c5c4ad5 Mon Sep 17 00:00:00 2001
From: Czar Echavez <Czar.Echavez@envitia.com>
Date: Thu, 5 Sep 2024 16:47:17 +0100
Subject: [PATCH 1/2] #2345: remove try catch + todo - figure out why db
 connection cannot be made

---
 .../system/services/web_server/web_server.py  | 54 ++++++++++---------
 1 file changed, 30 insertions(+), 24 deletions(-)

diff --git a/src/primaite/simulator/system/services/web_server/web_server.py b/src/primaite/simulator/system/services/web_server/web_server.py
index 4fc64e1f..f9f561df 100644
--- a/src/primaite/simulator/system/services/web_server/web_server.py
+++ b/src/primaite/simulator/system/services/web_server/web_server.py
@@ -108,37 +108,43 @@ class WebServer(Service):
         :type: payload: HttpRequestPacket
         """
         response = HttpResponsePacket(status_code=HttpStatusCode.NOT_FOUND, payload=payload)
-        try:
-            parsed_url = urlparse(payload.request_url)
-            path = parsed_url.path.strip("/")
 
-            if len(path) < 1:
+        parsed_url = urlparse(payload.request_url)
+        path = parsed_url.path.strip("/") if parsed_url and parsed_url.path else ""
+
+        if len(path) < 1:
+            # query succeeded
+            response.status_code = HttpStatusCode.OK
+
+        if path.startswith("users"):
+            # get data from DatabaseServer
+            # get all users
+            if self._establish_db_connection():
+                # unable to create a db connection
+                response.status_code = HttpStatusCode.INTERNAL_SERVER_ERROR
+
+            if self.db_connection.query("SELECT"):
                 # query succeeded
+                self.set_health_state(SoftwareHealthState.GOOD)
                 response.status_code = HttpStatusCode.OK
+            else:
+                self.set_health_state(SoftwareHealthState.COMPROMISED)
+        return response
 
-            if path.startswith("users"):
-                # get data from DatabaseServer
-                # get all users
-                if not self.db_connection:
-                    self._establish_db_connection()
-
-                if self.db_connection.query("SELECT"):
-                    # query succeeded
-                    self.set_health_state(SoftwareHealthState.GOOD)
-                    response.status_code = HttpStatusCode.OK
-                else:
-                    self.set_health_state(SoftwareHealthState.COMPROMISED)
-
-            return response
-        except Exception:  # TODO: refactor this. Likely to cause silent bugs. (ADO ticket #2345 )
-            # something went wrong on the server
-            response.status_code = HttpStatusCode.INTERNAL_SERVER_ERROR
-            return response
-
-    def _establish_db_connection(self) -> None:
+    def _establish_db_connection(self) -> bool:
         """Establish a connection to db."""
+        # if active db connection, return true
+        if self.db_connection:
+            return True
+
+        # otherwise, try to create db connection
         db_client = self.software_manager.software.get("DatabaseClient")
+
+        if db_client is None:
+            return False  # database client not installed
+
         self.db_connection: DatabaseClientConnection = db_client.get_new_connection()
+        return self.db_connection is not None
 
     def send(
         self,

From 4a48a8d0547f00f186617cd4226d3853fd0e2be3 Mon Sep 17 00:00:00 2001
From: Czar Echavez <Czar.Echavez@envitia.com>
Date: Mon, 9 Sep 2024 10:54:42 +0100
Subject: [PATCH 2/2] #2345: return error if db connection cannot be made

---
 .../simulator/system/services/web_server/web_server.py         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/primaite/simulator/system/services/web_server/web_server.py b/src/primaite/simulator/system/services/web_server/web_server.py
index f9f561df..0df47999 100644
--- a/src/primaite/simulator/system/services/web_server/web_server.py
+++ b/src/primaite/simulator/system/services/web_server/web_server.py
@@ -119,9 +119,10 @@ class WebServer(Service):
         if path.startswith("users"):
             # get data from DatabaseServer
             # get all users
-            if self._establish_db_connection():
+            if not self._establish_db_connection():
                 # unable to create a db connection
                 response.status_code = HttpStatusCode.INTERNAL_SERVER_ERROR
+                return response
 
             if self.db_connection.query("SELECT"):
                 # query succeeded