Merge pull request #514 from wazuh/merge-4.14.0-into-4.14.1

Merge 4.14.0 into 4.14.1

Author: nico-stefani

src/wazuh_testing/tools/simulators/remoted_simulator.py

@@ -68,6 +68,8 @@ def __init__(self,
         self.last_message_ctx = {}
         self.request_counter = 0
 
+        self._queue_response_req_message = Queue()
+
     # Properties
 
     @property
@@ -133,9 +135,12 @@ def send_custom_message(self, message: Union[str, bytes]) -> None:
         if not isinstance(message, bytes):
             message = message.encode()
 
-        self.custom_message = message
+        with self._queue_response_req_message.mutex:
+            self._queue_response_req_message.queue.clear()
         self.custom_message_sent = False
 
+        self.custom_message = message
+
     # Internal methods.
 
     def __remoted_response_simulation(self, request: Any) -> bytes:
@@ -176,9 +181,13 @@ def __remoted_response_simulation(self, request: Any) -> bytes:
         elif '#!-agent shutdown' in message:
             self.__mitm.event.set()
             response = _RESPONSE_SHUTDOWN
+        elif '#!-req' in message:
+            self._queue_response_req_message.put(message)
+            response = _RESPONSE_EMPTY
         elif self.custom_message and not self.custom_message_sent:
             response = self.custom_message
             self.custom_message_sent = True
+            self.custom_message = None
         elif '#!-' in message:
             response = _RESPONSE_ACK
         else: