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

Fixed linuxnewuser logger and added some logs to windowsnewuser for symmetry.

This commit is contained in:
Shay Nehmad 2019-10-03 15:29:23 +03:00
parent 44a1f70da9
commit c4d53d14c6
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
monkey/infection_monkey/utils/linux/users.py
View File

@ -1,7 +1,10 @@
import datetime import datetime
import logging
import subprocess import subprocess
from infection_monkey.utils.auto_new_user import AutoNewUser, logger from infection_monkey.utils.auto_new_user import AutoNewUser
logger = logging.getLogger(__name__)
def get_linux_commands_to_add_user(username): def get_linux_commands_to_add_user(username):

13
monkey/infection_monkey/utils/windows/users.py
View File

@ -1,3 +1,4 @@
import logging
import subprocess import subprocess
from infection_monkey.utils.auto_new_user import AutoNewUser from infection_monkey.utils.auto_new_user import AutoNewUser
@ -5,6 +6,7 @@ from infection_monkey.utils.new_user_error import NewUserError
ACTIVE_NO_NET_USER = '/ACTIVE:NO' ACTIVE_NO_NET_USER = '/ACTIVE:NO'
logger = logging.getLogger(__name__)
def get_windows_commands_to_add_user(username, password, should_be_active=False): def get_windows_commands_to_add_user(username, password, should_be_active=False):
windows_cmds = [ windows_cmds = [
@ -46,6 +48,7 @@ class AutoNewWindowsUser(AutoNewUser):
super(AutoNewWindowsUser, self).__init__(username, password) super(AutoNewWindowsUser, self).__init__(username, password)
windows_cmds = get_windows_commands_to_add_user(self.username, self.password, True) windows_cmds = get_windows_commands_to_add_user(self.username, self.password, True)
logger.debug("Trying to add {} with commands {}".format(self.username, str(windows_cmds)))
_ = subprocess.check_output(windows_cmds, stderr=subprocess.STDOUT, shell=True) _ = subprocess.check_output(windows_cmds, stderr=subprocess.STDOUT, shell=True)
def __enter__(self): def __enter__(self):
@ -79,14 +82,20 @@ class AutoNewWindowsUser(AutoNewUser):
def try_deactivate_user(self): def try_deactivate_user(self):
try: try:
commands_to_deactivate_user = get_windows_commands_to_deactivate_user(self.username)
logger.debug(
"Trying to deactivate {} with commands {}".format(self.username, str(commands_to_deactivate_user)))
_ = subprocess.check_output( _ = subprocess.check_output(
get_windows_commands_to_deactivate_user(self.username), stderr=subprocess.STDOUT, shell=True) commands_to_deactivate_user, stderr=subprocess.STDOUT, shell=True)
except Exception as err: except Exception as err:
raise NewUserError("Can't deactivate user {}. Info: {}".format(self.username, err)) raise NewUserError("Can't deactivate user {}. Info: {}".format(self.username, err))
def try_delete_user(self): def try_delete_user(self):
try: try:
commands_to_delete_user = get_windows_commands_to_delete_user(self.username)
logger.debug(
"Trying to deactivate {} with commands {}".format(self.username, str(commands_to_delete_user)))
_ = subprocess.check_output( _ = subprocess.check_output(
get_windows_commands_to_delete_user(self.username), stderr=subprocess.STDOUT, shell=True) commands_to_delete_user, stderr=subprocess.STDOUT, shell=True)
except Exception as err: except Exception as err:
raise NewUserError("Can't delete user {}. Info: {}".format(self.username, err)) raise NewUserError("Can't delete user {}. Info: {}".format(self.username, err))