Refactor powershell client to not perform actions on init and clean up powershell exploiter a bit

monkey/infection_monkey/exploit/powershell.py

@@ -112,8 +112,16 @@ class PowerShellExploiter(HostExploiter):
         self, credentials: List[Credentials], auth_options: List[AuthOptions]
     ) -> Optional[IPowerShellClient]:
         for (creds, opts) in zip(credentials, auth_options):
-            try:
             client = PowerShellClient(self.host.ip_addr, creds, opts)
+            if self._is_client_auth_valid(creds, client):
+                return client
+
+        return None
+
+    def _is_client_auth_valid(self, creds: Credentials, client: IPowerShellClient) -> bool:
+        try:
+            # attempt to execute dir command to know if authentication was successful
+            client.execute_cmd("dir")
 
             logger.info(
                 f"Successfully logged into {self.host.ip_addr} using Powershell. User: "
@@ -121,15 +129,14 @@ class PowerShellExploiter(HostExploiter):
             )
             self._report_login_attempt(True, creds)
 
-                return client
+            return True
         except Exception as ex:  # noqa: F841
             logger.debug(
                 f"Error logging into {self.host.ip_addr} using Powershell. User: "
                 f"{creds.username}, SecretType: {creds.secret_type.name} -- Error: {ex}"
             )
             self._report_login_attempt(False, creds)
-
-        return None
+            return False
 
     def _report_login_attempt(self, result: bool, credentials: Credentials):
         if credentials.secret_type in [SecretType.PASSWORD, SecretType.CACHED]:

monkey/infection_monkey/exploit/powershell_utils/powershell_client.py

@@ -77,9 +77,6 @@ class PowerShellClient(IPowerShellClient):
             connection_timeout=CONNECTION_TIMEOUT,
         )
 
-        # attempt to execute dir command to know if authentication was successful
-        self.execute_cmd("dir")
-
     def execute_cmd(self, cmd: str) -> str:
         output, _, _ = self._client.execute_cmd(cmd)
         return output