Updated Server to used buildListener for pings and updated the listener and firewall to handle definitions accordingly

2026-10-30 22:50:36 -04:00
parent 4ccd44937f
commit 12b28f037a
5 changed files with 157 additions and 120 deletions
@@ -6,33 +6,34 @@ from core.runtime.resolver import resolveItem


 def buildFirewall(listener, outputs):
-    #firewall_log = os.environ.get("LOGS_FIREWALL", "false").lower() == "true"
-    firewall_log = True
+    if hasattr(listener, "filters"):
+        #firewall_log = os.environ.get("LOGS_FIREWALL", "false").lower() == "true"
+        firewall_log = True

-    status_code = 200
-    outputs["firewall_allowed"] = []
-    for item in outputs[listener.recursive["source"]]:
-        resolved = resolveItem(listener, item)
+        status_code = 200
+        outputs["firewall_allowed"] = []
+        for item in outputs[listener.recursive["source"]]:
+            resolved = resolveItem(listener, item)

-        match, filter = applyConditions(listener, resolved, outputs)
+            match, filter = applyConditions(listener, resolved, outputs)

-        if match:
-            status_code = filter.get("status_code", 200)
+            if match:
+                status_code = filter.get("status_code", 200)

-            if filter.get("execute", False):
-                from core.execution.createthread import buildThread
+                if filter.get("execute", False):
+                    from core.execution.createthread import buildThread

-                thread = buildThread(filter["execute"])
+                    thread = buildThread(filter["execute"])

-            if firewall_log:
-                logging.info(filter.get("print"))
-                logging.info(f"Returning status_code: {status_code}")
-            continue
+                if firewall_log:
+                    logging.info(filter.get("print"))
+                    logging.info(f"Returning status_code: {status_code}")
+                continue

-        outputs["firewall_allowed"].append(item)
-    
-    if outputs["firewall_allowed"] != []:
-        return True, status_code
+            outputs["firewall_allowed"].append(item)
+        
+        if outputs["firewall_allowed"] != []:
+            return True, status_code

-    #Needs to be present to prevent TypeError
-    return False, status_code
+        #Needs to be present to prevent TypeError
+        return False, status_code