Agent: Use Paths in IPowerShellClient.copy_file()

monkey/infection_monkey/exploit/powershell.py

@@ -1,5 +1,4 @@
 import logging
-import os
 from pathlib import Path
 from typing import List, Optional
 
@@ -185,7 +184,7 @@ class PowerShellExploiter(HostExploiter):
 
     def _copy_monkey_binary_to_victim(self, monkey_path_on_victim: Path):
 
-        temp_monkey_binary_filepath = f"monkey_temp_bin_{get_random_file_suffix()}"
+        temp_monkey_binary_filepath = Path(f"./monkey_temp_bin_{get_random_file_suffix()}")
 
         self._create_local_agent_file(temp_monkey_binary_filepath)
 
@@ -195,8 +194,8 @@ class PowerShellExploiter(HostExploiter):
         except Exception as ex:
             raise RemoteAgentCopyError(f"Failed to copy the agent binary to the victim: {ex}")
         finally:
-            if os.path.isfile(temp_monkey_binary_filepath):
+            if temp_monkey_binary_filepath.is_file():
-                os.remove(temp_monkey_binary_filepath)
+                temp_monkey_binary_filepath.unlink()
 
     def _create_local_agent_file(self, binary_path):
         agent_binary_bytes = self.agent_repository.get_agent_binary("windows")

monkey/infection_monkey/exploit/powershell_utils/powershell_client.py

@@ -64,7 +64,7 @@ class IPowerShellClient(Protocol, metaclass=abc.ABCMeta):
         pass
 
     @abc.abstractmethod
-    def copy_file(self, src: str, dest: Path) -> bool:
+    def copy_file(self, src: Path, dest: Path) -> bool:
         pass
 
     @abc.abstractmethod
@@ -102,10 +102,9 @@ class PowerShellClient(IPowerShellClient):
         output, _, _ = self._client.execute_cmd(cmd)
         return output
 
-    def copy_file(self, src: str, dest: Path):
+    def copy_file(self, src: Path, dest: Path):
-        dest = str(dest)
         try:
-            self._client.copy(src, dest)
+            self._client.copy(str(src), str(dest))
             logger.debug(f"Successfully copied {src} to {dest} on {self._ip_addr}")
         except Exception as ex:
             logger.error(f"Failed to copy {src} to {dest} on {self._ip_addr}: {ex}")