From 09a1297f47ccefa981406333f64053f6608c9f20 Mon Sep 17 00:00:00 2001
From: Mike Salvatore <mike.s.salvatore@gmail.com>
Date: Fri, 17 Dec 2021 08:19:14 -0500
Subject: [PATCH] Agent: User relative imports within ransomware package

---
 .../infection_monkey/ransomware/file_selectors.py   |  3 ++-
 .../ransomware/ransomware_payload.py                |  5 +++--
 .../ransomware/ransomware_payload_builder.py        | 13 +++++++------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/monkey/infection_monkey/ransomware/file_selectors.py b/monkey/infection_monkey/ransomware/file_selectors.py
index 33b73dd06..5707fba7d 100644
--- a/monkey/infection_monkey/ransomware/file_selectors.py
+++ b/monkey/infection_monkey/ransomware/file_selectors.py
@@ -2,7 +2,6 @@ from pathlib import Path
 from typing import List, Set
 
 from common.utils.file_utils import get_file_sha256_hash
-from infection_monkey.ransomware.consts import README_FILE_NAME, README_SHA256_HASH
 from infection_monkey.utils.dir_utils import (
     file_extension_filter,
     filter_files,
@@ -11,6 +10,8 @@ from infection_monkey.utils.dir_utils import (
     is_not_symlink_filter,
 )
 
+from .consts import README_FILE_NAME, README_SHA256_HASH
+
 
 class ProductionSafeTargetFileSelector:
     def __init__(self, targeted_file_extensions: Set[str]):
diff --git a/monkey/infection_monkey/ransomware/ransomware_payload.py b/monkey/infection_monkey/ransomware/ransomware_payload.py
index a1e052970..227829d10 100644
--- a/monkey/infection_monkey/ransomware/ransomware_payload.py
+++ b/monkey/infection_monkey/ransomware/ransomware_payload.py
@@ -2,11 +2,12 @@ import logging
 from pathlib import Path
 from typing import Callable, List
 
-from infection_monkey.ransomware.consts import README_FILE_NAME, README_SRC
-from infection_monkey.ransomware.ransomware_config import RansomwareConfig
 from infection_monkey.telemetry.file_encryption_telem import FileEncryptionTelem
 from infection_monkey.telemetry.messengers.i_telemetry_messenger import ITelemetryMessenger
 
+from .consts import README_FILE_NAME, README_SRC
+from .ransomware_config import RansomwareConfig
+
 logger = logging.getLogger(__name__)
 
 
diff --git a/monkey/infection_monkey/ransomware/ransomware_payload_builder.py b/monkey/infection_monkey/ransomware/ransomware_payload_builder.py
index 9f0d78754..c5eb034f0 100644
--- a/monkey/infection_monkey/ransomware/ransomware_payload_builder.py
+++ b/monkey/infection_monkey/ransomware/ransomware_payload_builder.py
@@ -1,12 +1,6 @@
 import logging
 from pprint import pformat
 
-from infection_monkey.ransomware import readme_dropper
-from infection_monkey.ransomware.file_selectors import ProductionSafeTargetFileSelector
-from infection_monkey.ransomware.in_place_file_encryptor import InPlaceFileEncryptor
-from infection_monkey.ransomware.ransomware_config import RansomwareConfig
-from infection_monkey.ransomware.ransomware_payload import RansomwarePayload
-from infection_monkey.ransomware.targeted_file_extensions import TARGETED_FILE_EXTENSIONS
 from infection_monkey.telemetry.messengers.batching_telemetry_messenger import (
     BatchingTelemetryMessenger,
 )
@@ -15,6 +9,13 @@ from infection_monkey.telemetry.messengers.legacy_telemetry_messenger_adapter im
 )
 from infection_monkey.utils.bit_manipulators import flip_bits
 
+from . import readme_dropper
+from .file_selectors import ProductionSafeTargetFileSelector
+from .in_place_file_encryptor import InPlaceFileEncryptor
+from .ransomware_config import RansomwareConfig
+from .ransomware_payload import RansomwarePayload
+from .targeted_file_extensions import TARGETED_FILE_EXTENSIONS
+
 EXTENSION = ".m0nk3y"
 CHUNK_SIZE = 4096 * 24