p15670423
/
monkey
1
0
Fork 5
Code Issues Pull Requests 3 Projects Releases Wiki Activity

Agent: Remove ransomware cleanup function

This commit is contained in:
Ilija Lazoroski 2021-12-15 12:44:48 +01:00 committed by Mike Salvatore
parent 8423a064bb
commit 20890e51ec
2 changed files with 1 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
monkey/infection_monkey/ransomware/ransomware_payload.py
View File

@ -30,7 +30,6 @@ class RansomwarePayload:
self._readme_file_path = (
self._target_directory / README_FILE_NAME if self._target_directory else None
)
self._readme_incomplete = False
def run_payload(self):
if not self._target_directory:
@ -67,26 +66,6 @@ class RansomwarePayload:
def _leave_readme_in_target_directory(self):
try:
self._readme_incomplete = True
self._leave_readme(README_SRC, self._readme_file_path)
self._readme_incomplete = False
except Exception as ex:
logger.warning(f"An error occurred while attempting to leave a README.txt file: {ex}")
def cleanup(self):
# This cleanup function is only concerned with cleaning up and replacing *incomplete*
# README.txt files; its goal is not to ensure the existence of a README file. Therefore,
# only retry if a README.txt file actually exists.
if self._readme_incomplete and self._readme_file_path.exists():
logger.info(
"The process of leaving a README.txt was interrupted. Removing the corrupt file "
"and trying again."
)
try:
self._readme_file_path.unlink()
self._leave_readme_in_target_directory()
except Exception as ex:
logger.error(
"An error occurred while trying to remove the corrupt or incomplete README.txt "
f"file: {ex}"
)

27
monkey/tests/unit_tests/infection_monkey/ransomware/test_ransomware_payload.py
View File

@ -1,4 +1,4 @@
from pathlib import Path, PurePosixPath
from pathlib import PurePosixPath
from unittest.mock import MagicMock
import pytest
@ -184,28 +184,3 @@ def test_leave_readme_exceptions_handled(build_ransomware_payload, ransomware_pa
# Test will fail if exception is raised and not handled
ransomware_payload.run_payload()
ransomware_payload.cleanup()
def test_cleanup_incomplete_readme(build_ransomware_payload, ransomware_payload_config):
def leave_readme(_: Path, dest: Path):
if leave_readme.i == 0:
dest.touch()
leave_readme.i += 1
raise Exception("Test exception when leaving README")
leave_readme.i = 0
ransomware_payload_config.readme_enabled = True
ransomware_payload = build_ransomware_payload(
config=ransomware_payload_config, leave_readme=leave_readme
)
ransomware_payload.run_payload()
assert (ransomware_payload_config.target_directory / README_FILE_NAME).exists()
ransomware_payload.cleanup()
assert not (ransomware_payload_config.target_directory / README_FILE_NAME).exists()
assert leave_readme.i == 2