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

Agent: Fix dropper date referencing 

* Make dropper date reference path from strings to Path objects
* Fix try/except block logic and indentation
This commit is contained in:
Ilija Lazoroski 2022-06-01 12:40:00 +02:00
parent 711cab5f38
commit 8ef0b44841
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
monkey/infection_monkey/dropper.py
View File

@ -7,7 +7,7 @@ import shutil
import subprocess import subprocess
import sys import sys
import time import time
from pathlib import WindowsPath from pathlib import PosixPath, WindowsPath
from common.utils.attack_utils import UsageEnum from common.utils.attack_utils import UsageEnum
from infection_monkey.utils.commands import ( from infection_monkey.utils.commands import (
@ -34,8 +34,8 @@ except NameError:
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
MOVEFILE_DELAY_UNTIL_REBOOT = 4 MOVEFILE_DELAY_UNTIL_REBOOT = 4
DATE_REFERENCE_PATH_WINDOWS = r"%windir%\system32\kernel32.dll" DATE_REFERENCE_PATH_WINDOWS = WindowsPath(r"%windir%\system32\kernel32.dll")
DATE_REFERENCE_PATH_LINUX = "/bin/sh" DATE_REFERENCE_PATH_LINUX = PosixPath("/bin/sh")
class MonkeyDrops(object): class MonkeyDrops(object):
@ -115,14 +115,19 @@ class MonkeyDrops(object):
dropper_date_reference_path = os.path.expandvars(DATE_REFERENCE_PATH_WINDOWS) dropper_date_reference_path = os.path.expandvars(DATE_REFERENCE_PATH_WINDOWS)
else: else:
dropper_date_reference_path = DATE_REFERENCE_PATH_LINUX dropper_date_reference_path = DATE_REFERENCE_PATH_LINUX
try:
ref_stat = os.stat(dropper_date_reference_path)
except OSError:
logger.warning(
"Cannot set reference date using '%s', file not found",
dropper_date_reference_path,
)
else:
try: try:
ref_stat = os.stat(dropper_date_reference_path)
os.utime(self._config["destination_path"], (ref_stat.st_atime, ref_stat.st_mtime)) os.utime(self._config["destination_path"], (ref_stat.st_atime, ref_stat.st_mtime))
except OSError: except OSError:
logger.warning( logger.warning("Cannot set reference date to destination file")
"Cannot set reference date using '%s', file not found",
dropper_date_reference_path,
)
monkey_options = build_monkey_commandline_explicitly( monkey_options = build_monkey_commandline_explicitly(
parent=self.opts.parent, parent=self.opts.parent,