Rename to check_firewall_lists_res

Author: bitterpanda63

aikido_zen/background_process/commands/check_firewall_lists.py

@@ -14,7 +14,7 @@ def process_check_firewall_lists(
     """
     Checks whether an IP is blocked and whether there is an ongoing attack wave
     data: {"ip": string, "user-agent": string, "is_attack_wave_request" ?: bool}
-    returns -> FirewallListsCheckRes
+    returns -> CheckFirewallListsRes
     """
     ip = data["ip"]
     if ip is not None and isinstance(ip, str):
@@ -25,23 +25,23 @@ def process_check_firewall_lists(
         # Global IP Blocklist (e.g. blocking known threat actors)
         reason = connection_manager.firewall_lists.is_blocked_ip(ip)
         if reason:
-            return FirewallListsCheckRes(blocked=True, type="blocklist", reason=reason)
+            return CheckFirewallListsRes(blocked=True, type="blocklist", reason=reason)
 
     user_agent = data["user-agent"]
     if user_agent is not None and isinstance(user_agent, str):
         # User agent blocking (e.g. blocking AI scrapers)
         if connection_manager.firewall_lists.is_user_agent_blocked(user_agent):
-            return FirewallListsCheckRes(blocked=True, type="bot-blocking")
+            return CheckFirewallListsRes(blocked=True, type="bot-blocking")
 
     is_attack_wave_request = data.get("is_attack_wave_request", None)
     if is_attack_wave_request and ip is not None:
         if connection_manager.attack_wave_detector.check(ip):
-            return FirewallListsCheckRes(blocked=False, is_attack_wave=True)
+            return CheckFirewallListsRes(blocked=False, is_attack_wave=True)
 
-    return FirewallListsCheckRes()
+    return CheckFirewallListsRes()
 
 
-class FirewallListsCheckRes:
+class CheckFirewallListsRes:
     def __init__(self, blocked=False, is_attack_wave=False, type=None, reason=None):
         self.blocked = blocked
         self.is_attack_wave = is_attack_wave

aikido_zen/sources/functions/request_handler.py

@@ -7,7 +7,7 @@
 from aikido_zen.thread.thread_cache import get_cache
 from .ip_allowed_to_access_route import ip_allowed_to_access_route
 import aikido_zen.background_process.comms as c
-from ...background_process.commands.check_firewall_lists import FirewallListsCheckRes
+from ...background_process.commands.check_firewall_lists import CheckFirewallListsRes
 from ...background_process.queue_helpers import ReportingQueueAttackWaveEvent
 from ...vulnerabilities.attack_wave_detection.is_web_scanner import is_web_scanner
 
@@ -73,7 +73,7 @@ def pre_response():
     )
     if not check_fw_lists_res["success"] or not check_fw_lists_res["data"]["blocked"]:
         return
-    res: FirewallListsCheckRes = check_fw_lists_res["data"]
+    res: CheckFirewallListsRes = check_fw_lists_res["data"]
 
     if res.is_attack_wave:
         # Report to core & increase stats