Agent: Improve exception handling in mssqlexec.py

monkey/common/utils/exceptions.py

@@ -1,7 +1,3 @@
-class ExploitingVulnerableMachineError(Exception):
-    """ Raise when exploiter failed, but machine is vulnerable """
-
-
 class FailedExploitationError(Exception):
     """ Raise when exploiter fails instead of returning False """
 

monkey/infection_monkey/exploit/mssqlexec.py

@@ -1,12 +1,11 @@
 import logging
 import os
-import sys
 from time import sleep
 
 import pymssql
 
 from common.common_consts.timeouts import LONG_REQUEST_TIMEOUT
-from common.utils.exceptions import ExploitingVulnerableMachineError, FailedExploitationError
+from common.utils.exceptions import FailedExploitationError
 from common.utils.exploit_enum import ExploitType
 from infection_monkey.exploit.HostExploiter import HostExploiter
 from infection_monkey.exploit.tools.helpers import get_agent_dest_path
@@ -65,12 +64,17 @@ class MSSQLExploiter(HostExploiter):
             self.options["credentials"]["exploit_user_list"],
             self.options["credentials"]["exploit_password_list"],
         )
+        try:
             self.cursor = self.brute_force(self.host.ip_addr, self.SQL_DEFAULT_TCP_PORT, creds)
+        except FailedExploitationError:
+            logger.info(
+                f"Failed brute-forcing of MSSQL server on {self.host},"
+                f" no credentials were successful"
+            )
+            return self.exploit_result
 
         # Create dir for payload
         self.create_temp_dir()
-
-        try:
         self.create_empty_payload_file()
 
         http_thread = self.start_monkey_server()
@@ -83,8 +87,6 @@ class MSSQLExploiter(HostExploiter):
         self.run_monkey()
 
         self.remove_temp_dir()
-        except Exception as e:
-            raise ExploitingVulnerableMachineError(e.args).with_traceback(sys.exc_info()[2])
 
         self.exploit_result.propagation_success = True
         return self.exploit_result