Fix bug with thread_cache sync and update thread_cache test cases

Author: bitterpanda63

aikido_zen/storage/statistics/__init__.py

@@ -44,7 +44,7 @@ def get_record(self):
                     "blocked": self.attacks_blocked,
                 },
             },
-            "operations": self.operations,
+            "operations": dict(self.operations),
         }
 
     def import_from_record(self, record):

aikido_zen/thread/thread_cache_test.py

@@ -68,7 +68,7 @@ def test_reset(thread_cache: ThreadCache):
     thread_cache.config.bypassed_ips.add("192.168.1.1")
     thread_cache.config.blocked_uids.add("user123")
     thread_cache.stats.increment_total_hits()
-    thread_cache.stats.on_detected_attack(blocked=True)
+    thread_cache.stats.on_detected_attack(blocked=True, operation="test")
 
     thread_cache.reset()
 
@@ -236,9 +236,11 @@ def test_renew_called_with_correct_args(mock_get_comms, thread_cache: ThreadCach
     # Setup initial state
     thread_cache.stats.increment_total_hits()
     thread_cache.stats.increment_total_hits()
-    thread_cache.stats.on_detected_attack(blocked=True)
-    thread_cache.stats.on_detected_attack(blocked=False)
-    thread_cache.stats.on_detected_attack(blocked=False)
+    thread_cache.stats.operations.register_call("op1", "sql_op")
+    thread_cache.stats.operations.register_call("op2", "sql_op")
+    thread_cache.stats.on_detected_attack(blocked=True, operation="op1")
+    thread_cache.stats.on_detected_attack(blocked=False, operation="op1")
+    thread_cache.stats.on_detected_attack(blocked=False, operation="op2")
     thread_cache.routes.initialize_route({"method": "GET", "route": "/test"})
     thread_cache.routes.increment_route({"method": "GET", "route": "/test"})
 
@@ -269,6 +271,18 @@ def test_renew_called_with_correct_args(mock_get_comms, thread_cache: ThreadCach
                     "aborted": 0,
                     "attacksDetected": {"blocked": 1, "total": 3},
                 },
+                "operations": {
+                    "op1": {
+                        "attacksDetected": {"blocked": 1, "total": 2},
+                        "kind": "sql_op",
+                        "total": 1,
+                    },
+                    "op2": {
+                        "attacksDetected": {"blocked": 0, "total": 1},
+                        "kind": "sql_op",
+                        "total": 1,
+                    },
+                },
             },
             "middleware_installed": False,
             "hostnames": [],
@@ -313,6 +327,7 @@ def test_sync_data_for_users(mock_get_comms, thread_cache: ThreadCache):
                     "aborted": 0,
                     "attacksDetected": {"total": 0, "blocked": 0},
                 },
+                "operations": {},
             },
             "middleware_installed": False,
             "hostnames": [],
@@ -362,6 +377,7 @@ def test_renew_called_with_empty_routes(mock_get_comms, thread_cache: ThreadCach
                     "aborted": 0,
                     "attacksDetected": {"total": 0, "blocked": 0},
                 },
+                "operations": {},
             },
             "middleware_installed": False,
             "hostnames": [],
@@ -399,6 +415,7 @@ def test_renew_called_with_no_requests(mock_get_comms, thread_cache: ThreadCache
                     "aborted": 0,
                     "attacksDetected": {"total": 0, "blocked": 0},
                 },
+                "operations": {},
             },
             "middleware_installed": False,
             "hostnames": [],