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

Rename check for 64-bit to make explict it's a windows only check

This commit is contained in:
Daniel Goldberg 2018-04-12 17:57:21 +03:00
parent 1407ab3969
commit 3e859d84fb
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
infection_monkey/utils.py
View File

@ -15,7 +15,11 @@ def get_dropper_log_path():
else WormConfiguration.dropper_log_path_linux else WormConfiguration.dropper_log_path_linux
def is_64bit_os(): def is_64bit_windows_os():
'''
Checks for 64 bit Windows OS using environment variables.
:return:
'''
return 'PROGRAMFILES(X86)' in os.environ return 'PROGRAMFILES(X86)' in os.environ

4
infection_monkey/windows_upgrader.py
View File

@ -10,7 +10,7 @@ from config import WormConfiguration
from control import ControlClient from control import ControlClient
from exploit.tools import build_monkey_commandline_explicitly from exploit.tools import build_monkey_commandline_explicitly
from model import MONKEY_CMDLINE_WINDOWS from model import MONKEY_CMDLINE_WINDOWS
from utils import is_windows_os, is_64bit_os, is_64bit_python from utils import is_windows_os, is_64bit_windows_os, is_64bit_python
__author__ = 'itay.mizeretz' __author__ = 'itay.mizeretz'
@ -27,7 +27,7 @@ class WindowsUpgrader(object):
@staticmethod @staticmethod
def should_upgrade(): def should_upgrade():
return is_windows_os() and is_64bit_os() \ return is_windows_os() and is_64bit_windows_os() \
and not is_64bit_python() and not is_64bit_python()
@staticmethod @staticmethod