Merge pull request #1575 from guardicore/1536-remove-kill-file

Remove "Kill file" config option

CHANGELOG.md

@@ -13,6 +13,7 @@ Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Removed
 - The VSFTPD exploiter. #1533
 - Manual agent run command for CMD. #1570
+- "Kill file" option in the config. #1536
 
 ### Fixed
 - A bug in network map page that caused delay of telemetry log loading. #1545

monkey/infection_monkey/config.py

@@ -96,12 +96,6 @@ class Configuration(object):
     dropper_target_path_win_64 = r"C:\Windows\temp\monkey64.exe"
     dropper_target_path_linux = "/tmp/monkey"
 
-    ###########################
-    # Kill file
-    ###########################
-    kill_file_path_windows = "%windir%\\monkey.not"
-    kill_file_path_linux = "/var/run/monkey.not"
-
     ###########################
     # monkey config
     ###########################

monkey/infection_monkey/example.conf

@@ -26,8 +26,6 @@
 
   "monkey_dir_name": "monkey_dir",
 
-  "kill_file_path_linux": "/var/run/monkey.not",
-  "kill_file_path_windows": "%windir%\\monkey.not",
   "dropper_try_move_first": true,
   "exploiter_classes": [
     "SSHExploiter",

monkey/infection_monkey/main.py

@@ -78,16 +78,6 @@ def main():
     formatted_config = pformat(WormConfiguration.hide_sensitive_info(WormConfiguration.as_dict()))
     print(f"Loaded Configuration:\n{formatted_config}")
 
-    # Make sure we're not in a machine that has the kill file
-    kill_path = (
-        os.path.expandvars(WormConfiguration.kill_file_path_windows)
-        if sys.platform == "win32"
-        else WormConfiguration.kill_file_path_linux
-    )
-    if os.path.exists(kill_path):
-        print("Kill path found, finished run")
-        return True
-
     try:
         if MONKEY_ARG == monkey_mode:
             log_path = get_monkey_log_path()

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

@@ -213,24 +213,6 @@ INTERNAL = {
                 }
             },
         },
-        "kill_file": {
-            "title": "Kill file",
-            "type": "object",
-            "properties": {
-                "kill_file_path_windows": {
-                    "title": "Kill file path on Windows",
-                    "type": "string",
-                    "default": "%windir%\\monkey.not",
-                    "description": "Path of file which kills monkey if it exists (on Windows)",
-                },
-                "kill_file_path_linux": {
-                    "title": "Kill file path on Linux",
-                    "type": "string",
-                    "default": "/var/run/monkey.not",
-                    "description": "Path of file which kills monkey if it exists (on Linux)",
-                },
-            },
-        },
         "dropper": {
             "title": "Dropper",
             "type": "object",

monkey/monkey_island/cc/ui/src/components/configuration-components/InternalConfig.js

@@ -11,7 +11,6 @@ const sectionOrder = [
   'dropper',
   'classes',
   'general',
-  'kill_file',
   'testing'
 ];
 const initialSection = sectionOrder[0];

monkey/tests/data_for_tests/monkey_configs/monkey_config_standard.json

@@ -114,10 +114,6 @@
           "ElasticFinger"
         ]
       },
-      "kill_file": {
-        "kill_file_path_windows": "%windir%\\monkey.not",
-        "kill_file_path_linux": "/var/run/monkey.not"
-      },
       "dropper": {
         "dropper_set_date": true,
         "dropper_date_reference_path_windows": "%windir%\\system32\\kernel32.dll",