Merge branch 'main' into improved-wrapping-main

Author: bitterpanda63

aikido_zen/api_discovery/update_route_info.py

@@ -1,12 +1,22 @@
 """Exports update_route_info function"""
 
 from aikido_zen.helpers.logging import logger
+from .get_api_info import get_api_info
 from .merge_data_schemas import merge_data_schemas
 from .merge_auth_types import merge_auth_types
 
 ANALYSIS_ON_FIRST_X_ROUTES = 20
 
 
+def update_route_info_from_context(context, route):
+    if context is None:
+        return
+    if route["hits"] > ANALYSIS_ON_FIRST_X_ROUTES:
+        return
+    new_apispec = get_api_info(context)
+    route["apispec"] = update_api_info(new_apispec, route["apispec"])
+
+
 def update_route_info(new_apispec, route):
     """
     Checks if a route still needs to be updated (only analyzes first x routes),

aikido_zen/background_process/cloud_connection_manager/__init__.py

@@ -7,7 +7,7 @@
 from .update_firewall_lists import update_firewall_lists
 from ..api.http_api import ReportingApiHTTP
 from ..service_config import ServiceConfig
-from ..users import Users
+from aikido_zen.storage.users import Users
 from aikido_zen.storage.hostnames import Hostnames
 from ..realtime.start_polling_for_changes import start_polling_for_changes
 from ..statistics import Statistics

aikido_zen/background_process/cloud_connection_manager/init_test.py

@@ -2,7 +2,7 @@
 from aikido_zen.helpers.token import Token
 from aikido_zen.background_process.api.http_api import ReportingApiHTTP
 from aikido_zen.background_process.service_config import ServiceConfig
-from aikido_zen.background_process.users import Users
+from aikido_zen.storage.users import Users
 from aikido_zen.storage.hostnames import Hostnames
 from aikido_zen.ratelimiting.rate_limiter import RateLimiter
 from aikido_zen.background_process.statistics import Statistics

aikido_zen/background_process/commands/__init__.py

@@ -3,20 +3,14 @@
 from aikido_zen.helpers.logging import logger
 from .attack import process_attack
 from .read_property import process_read_property
-from .user import process_user
 from .should_ratelimit import process_should_ratelimit
-from .kill import process_kill
-from .statistics import process_statistics
 from .ping import process_ping
 from .sync_data import process_sync_data
 
 commands_map = {
     # This maps to a tuple : (function, returns_data?)
     # Commands that don't return data :
     "ATTACK": (process_attack, False),
-    "USER": (process_user, False),
-    "KILL": (process_kill, False),
-    "STATISTICS": (process_statistics, False),
     # Commands that return data :
     "SYNC_DATA": (process_sync_data, True),
     "READ_PROPERTY": (process_read_property, True),

aikido_zen/background_process/commands/kill.py

@@ -40,6 +40,10 @@ def process_sync_data(connection_manager, data, conn, queue=None):
             hostnames_entry["hits"],
         )
 
+    # Sync users
+    for user_entry in data.get("users", list()):
+        connection_manager.users.add_user_from_entry(user_entry)
+
     if connection_manager.conf.last_updated_at > 0:
         # Only report data if the config has been fetched.
         return {