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

Island: Change AgentBinaries URL parameter name 

Co-authored-by: Mike Salvatore <mike.s.salvatore@gmail.com>
This commit is contained in:
Shreya Malviya 2022-06-03 13:05:51 +05:30
parent 235e664485
commit c43bc3a0c1
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
monkey/monkey_island/cc/resources/agent_binaries.py
View File

@ -20,12 +20,12 @@ class UnsupportedOSError(Exception):
class AgentBinaries(AbstractResource): class AgentBinaries(AbstractResource):
urls = ["/api/agent-binaries/<string:host_os>"] urls = ["/api/agent-binaries/<string:os>"]
# Used by monkey. can't secure. # Used by monkey. can't secure.
def get(self, host_os): def get(self, os):
try: try:
path = get_agent_executable_path(host_os) path = get_agent_executable_path(os)
return send_from_directory(path.parent, path.name) return send_from_directory(path.parent, path.name)
except UnsupportedOSError as ex: except UnsupportedOSError as ex:
logger.error(ex) logger.error(ex)
@ -49,19 +49,17 @@ class AgentBinaries(AbstractResource):
logger.debug(f"No monkey executable for {filepath}") logger.debug(f"No monkey executable for {filepath}")
def get_agent_executable_path(host_os: str) -> Path: def get_agent_executable_path(os: str) -> Path:
try: try:
agent_path = get_executable_full_path(AGENTS[host_os]) agent_path = get_executable_full_path(AGENTS[os])
logger.debug(f'Local path for {host_os} executable is "{agent_path}"') logger.debug(f'Local path for {os} executable is "{agent_path}"')
if not agent_path.is_file(): if not agent_path.is_file():
logger.error(f"File {agent_path} not found") logger.error(f"File {agent_path} not found")
return agent_path return agent_path
except KeyError: except KeyError:
logger.warning(f"No monkey executables could be found for the host os: {host_os}") logger.warning(f"No monkey executables could be found for the host os: {os}")
raise UnsupportedOSError( raise UnsupportedOSError(f'No Agents are available for unsupported operating system "{os}"')
f'No Agents are available for unsupported operating system "{host_os}"'
)
def get_executable_full_path(executable_filename: str) -> Path: def get_executable_full_path(executable_filename: str) -> Path: