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

Island: Remove logic to download 32-bit monkeys

This commit is contained in:
Shreya Malviya 2022-02-26 12:55:09 +05:30
parent 62263b8fbf
commit ec9d3822a6
2 changed files with 6 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
monkey/monkey_island/cc/resources/monkey_download.py
View File

@ -11,61 +11,23 @@ from monkey_island.cc.server_utils.consts import MONKEY_ISLAND_ABS_PATH
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
MONKEY_DOWNLOADS = [ MONKEY_DOWNLOADS = [
{
"type": "linux",
"machine": "x86_64",
"filename": "monkey-linux-64",
},
{
"type": "linux",
"machine": "i686",
"filename": "monkey-linux-32",
},
{
"type": "linux",
"machine": "i386",
"filename": "monkey-linux-32",
},
{ {
"type": "linux", "type": "linux",
"filename": "monkey-linux-64", "filename": "monkey-linux-64",
}, },
{ {
"type": "windows", "type": "windows",
"machine": "x86",
"filename": "monkey-windows-32.exe",
},
{
"type": "windows",
"machine": "amd64",
"filename": "monkey-windows-64.exe", "filename": "monkey-windows-64.exe",
}, },
{
"type": "windows",
"machine": "64",
"filename": "monkey-windows-64.exe",
},
{
"type": "windows",
"machine": "32",
"filename": "monkey-windows-32.exe",
},
{
"type": "windows",
"filename": "monkey-windows-32.exe",
},
] ]
def get_monkey_executable(host_os, machine): def get_monkey_executable(host_os):
for download in MONKEY_DOWNLOADS: for download in MONKEY_DOWNLOADS:
if host_os == download.get("type") and machine == download.get("machine"): if host_os == download.get("type"):
logger.info("Monkey exec found for os: {0} and machine: {1}".format(host_os, machine)) logger.info(f"Monkey exec found for os: {host_os}")
return download return download
logger.warning( logger.warning(f"No monkey executables could be found for the host os: {host_os}")
"No monkey executables could be found for the host os or machine or both: host_os: {"
"0}, machine: {1}".format(host_os, machine)
)
return None return None
@ -80,7 +42,7 @@ class MonkeyDownload(flask_restful.Resource):
host_json = json.loads(request.data) host_json = json.loads(request.data)
host_os = host_json.get("os") host_os = host_json.get("os")
if host_os: if host_os:
result = get_monkey_executable(host_os.get("type"), host_os.get("machine")) result = get_monkey_executable(host_os.get("type"))
if result: if result:
# change resulting from new base path # change resulting from new base path

2
monkey/monkey_island/cc/services/run_local_monkey.py
View File

@ -25,7 +25,7 @@ class LocalMonkeyRunService:
@staticmethod @staticmethod
def run_local_monkey(): def run_local_monkey():
# get the monkey executable suitable to run on the server # get the monkey executable suitable to run on the server
result = get_monkey_executable(platform.system().lower(), platform.machine().lower()) result = get_monkey_executable(platform.system().lower())
if not result: if not result:
return False, "OS Type not found" return False, "OS Type not found"