p59342861
/
monkey
forked from p15670423/monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Agent: Change typehint for build_monkey_commandline's location 

The function can handle str, PurePath, or None. This typehint change
reflects that capability
This commit is contained in:
Mike Salvatore 2022-10-06 16:50:05 -04:00
parent 7bc9993c6f
commit eac3076828
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
monkey/infection_monkey/utils/commands.py
View File

@ -1,4 +1,5 @@
from typing import List, Optional from pathlib import PurePath
from typing import List, Optional, Union
from infection_monkey.config import GUID from infection_monkey.config import GUID
from infection_monkey.exploit.tools.helpers import AGENT_BINARY_PATH_LINUX, AGENT_BINARY_PATH_WIN64 from infection_monkey.exploit.tools.helpers import AGENT_BINARY_PATH_LINUX, AGENT_BINARY_PATH_WIN64
@ -9,7 +10,9 @@ DROPPER_TARGET_PATH_LINUX = AGENT_BINARY_PATH_LINUX
DROPPER_TARGET_PATH_WIN64 = AGENT_BINARY_PATH_WIN64 DROPPER_TARGET_PATH_WIN64 = AGENT_BINARY_PATH_WIN64
def build_monkey_commandline(servers: List[str], depth: int, location: Optional[str] = None) -> str: def build_monkey_commandline(
servers: List[str], depth: int, location: Union[str, PurePath, None] = None
) -> str:
return " " + " ".join( return " " + " ".join(
build_monkey_commandline_explicitly( build_monkey_commandline_explicitly(
@ -25,7 +28,7 @@ def build_monkey_commandline_explicitly(
parent: Optional[str] = None, parent: Optional[str] = None,
servers: Optional[List[str]] = None, servers: Optional[List[str]] = None,
depth: Optional[int] = None, depth: Optional[int] = None,
location: Optional[str] = None, location: Union[str, PurePath, None] = None,
) -> List[str]: ) -> List[str]:
cmdline = [] cmdline = []