[#88979] server: src: device_mgmt: Check if queued actions are valid

Signed-off-by: Anna Roszkiewicz <[email protected]>

Author: anroszkiewicz

server/src/device_mgmt/action.py

@@ -162,10 +162,20 @@ def send_action_queue(mac_address: str):
         msg = f"Device '{mac_address}' not connected to the management WS."
         raise WebSocketException(msg, RDFM_WS_INVALID_REQUEST)
 
+    if not remote_device.capabilities_updated.wait(ACTION_UPDATE_TIMEOUT):
+        msg = f"Capability list for '{mac_address} timed-out in {ACTION_UPDATE_TIMEOUT}s.'"
+        raise WebSocketException(msg, RDFM_WS_INVALID_REQUEST)
+
+    ensure_actions(mac_address)
     actions = server.instance._action_logs_db.fetch_device_queue(mac_address)
 
     for action in actions:
-        action_type = remote_device.actions.get(action.action_id)
+        if not (action_type := remote_device.actions.get(action.action_id)):
+            server.instance._action_logs_db.update_status(action.id, "error")
+            msg = f"Skipping invalid action '{action.action_id}' for device '{mac_address}'."
+            print(msg, flush=True)
+            continue
+
         execution = ActionExecution(action_type, action.id)
         server.instance.action_executions.add(execution)
 

server/src/device_mgmt/models/remote_device.py

@@ -50,6 +50,7 @@ def __init__(
         self.token = token
         self.capabilities = {}
         self.actions = {}
+        self.capabilities_updated = threading.Event()
         self.actions_updated = threading.Event()
         self.update_version = None
 
@@ -92,7 +93,7 @@ def __handle_device_message(self, request: Request):
             server.instance._devices_db.update_capabilities(
                 self.token.device_id, request.capabilities
             )
-            device_mgmt.action.send_action_queue(self.token.device_id)
+            self.capabilities_updated.set()
         elif isinstance(request, ActionExecResult):
             print(
                 "Action execution result for",
@@ -222,5 +223,11 @@ def event_loop(self):
         except KeyError:
             print("Redis is not configured. Unable to send device updates.")
 
+        thread = threading.Thread(
+            target=device_mgmt.action.send_action_queue,
+            args=(self.token.device_id, )
+        )
+        thread.start()
+
         while True:
             self.__handle_device_message(self.receive_message())