Merge pull request #1591 from guardicore/1537-constant-monkey-dir

1537 constant monkey dir

CHANGELOG.md

@@ -25,6 +25,7 @@ Changelog](https://keepachangelog.com/en/1.0.0/).
 - Checkbox that gave the option to not try to first move the dropper file. #1537
 - Custom singleton mutex name config option. #1589
 - Azure credential collector, because it was broken (not gathering credentials). #1535
+- Custom monkey directory name config option. #1537
 
 ### Fixed
 - A bug in network map page that caused delay of telemetry log loading. #1545

monkey/infection_monkey/config.py

@@ -129,9 +129,6 @@ class Configuration(object):
 
     keep_tunnel_open_time = 60
 
-    # Monkey files directory name
-    monkey_dir_name = "monkey_dir"
-
     ###########################
     # scanners config
     ###########################

monkey/infection_monkey/example.conf

@@ -23,8 +23,6 @@
   "dropper_target_path_win_64": "C:\\Windows\\temp\\monkey64.exe",
   "dropper_target_path_linux": "/tmp/monkey",
 
-  "monkey_dir_name": "monkey_dir",
-
   "exploiter_classes": [
     "SSHExploiter",
     "SmbExploiter",

monkey/infection_monkey/utils/monkey_dir.py

@@ -2,7 +2,7 @@ import os
 import shutil
 import tempfile
 
-from infection_monkey.config import WormConfiguration
+MONKEY_DIR_NAME = "monkey_dir"
 
 
 def create_monkey_dir():
@@ -26,4 +26,4 @@ def remove_monkey_dir():
 
 
 def get_monkey_dir_path():
-    return os.path.join(tempfile.gettempdir(), WormConfiguration.monkey_dir_name)
+    return os.path.join(tempfile.gettempdir(), MONKEY_DIR_NAME)

monkey/monkey_island/cc/services/config_schema/internal.py

@@ -15,13 +15,6 @@ INTERNAL = {
                     "description": "Time to keep tunnel open before going down after last exploit "
                     "(in seconds)",
                 },
-                "monkey_dir_name": {
-                    "title": "Monkey's directory name",
-                    "type": "string",
-                    "default": r"monkey_dir",
-                    "description": "Directory name for the directory which will contain all of the"
-                    " monkey files",
-                },
                 "started_on_island": {
                     "title": "Started on island",
                     "type": "boolean",

monkey/tests/data_for_tests/monkey_configs/monkey_config_standard.json

@@ -45,7 +45,6 @@
     "internal": {
       "general": {
         "keep_tunnel_open_time": 60,
-        "monkey_dir_name": "monkey_dir",
         "started_on_island": false
       },
       "monkey": {