Fix/log the correct value

agent/metasploit_agent.py

@@ -91,9 +91,11 @@ def process(self, message: m.Message) -> None:
                     module_instance = self._set_module_args(
                         selected_module, rhost, rport, is_ssl, options
                     )
-                except ValueError:
-                    logger.error(
-                        "Failed to set arguments for %s", selected_module.modulename
+                except ValueError as e:
+                    logger.warning(
+                        "Failed to set arguments for %s from %s",
+                        selected_module.modulename,
+                        e,
                     )
                     continue
                 job = module_instance.check_exploit()
@@ -176,8 +178,7 @@ def _get_job_results(
                 results = job_result["result"]
                 break
             if status == "errored":
-                logger.error("Module error: %s", job_result["error"])
-                break
+                logger.warning("Module Error: %s", job_result["error"])
             if time.time() - init_timestamp > MODULE_TIMEOUT:
                 logger.error("Metasploit job %s timed out", job_uuid)
                 break
@@ -227,7 +228,7 @@ def _set_module_args(
         try:
             rhost = socket.gethostbyname(vhost)
         except socket.gaierror as exc:
-            raise ValueError("The specified target is not valid") from exc
+            raise ValueError(f"The specified target {vhost} is not valid") from exc
         if "RHOSTS" in selected_module.required:
             selected_module["RHOSTS"] = rhost
         elif "DOMAIN" in selected_module.required:

tests/conftest.py

@@ -101,3 +101,11 @@ def metasploitable_scan_message() -> message.Message:
     selector = "v3.asset.ip.v4"
     msg_data = {"host": "192.168.1.17", "mask": "32", "version": 4}
     return message.Message.from_data(selector, data=msg_data)
+
+
+@pytest.fixture()
+def scan_message_host_not_exist() -> message.Message:
+    """Creates a message of type v3.asset.domain_name.service to be used by the agent for testing purposes."""
+    selector = "v3.asset.domain_name.service"
+    msg_data = {"schema": "https", "name": "sa.com", "port": 443}
+    return message.Message.from_data(selector, data=msg_data)

tests/metasploit_agent_test.py

@@ -226,3 +226,22 @@ def testMetasploitAgent_whenUnknownTarget_shouldNotBeProcessed(
     agent_instance.process(msg)
 
     connect_msfrpc_mock.assert_not_called()
+
+
+@pytest.mark.parametrize(
+    "agent_instance",
+    [["exploit/windows/http/exchange_proxyshell_rce", []]],
+    indirect=True,
+)
+def testExploit_whenHostNotExist_returnCorrectMessage(
+    agent_instance: msf_agent.MetasploitAgent,
+    agent_mock: list[message.Message],
+    agent_persist_mock: dict[str | bytes, str | bytes],
+    scan_message_host_not_exist: message.Message,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Unit test for agent metasploit exploit check, case when target is not exist"""
+    agent_instance.process(scan_message_host_not_exist)
+
+    assert len(agent_mock) == 0
+    assert "The specified target sa.com is not valid" in caplog.text