Merge pull request #1584 from guardicore/1537-send-log-to-server

1537 send log to server
guardicore · Nov 15, 2021 · be68d5b · be68d5b
2 parents 6ee1949 + 6e65bb4
commit be68d5b
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,7 @@ Changelog](https://keepachangelog.com/en/1.0.0/).
 - Sambacry exploiter. #1567
 - "Kill file" option in the config. #1536
 - Netstat collector, because network connection information wasn't used anywhere. #1535
+- Checkbox to disable/enable sending log to server. #1537
 
 ### Fixed
 - A bug in network map page that caused delay of telemetry log loading. #1545

diff --git a/monkey/infection_monkey/config.py b/monkey/infection_monkey/config.py
@@ -82,7 +82,6 @@ def as_dict(self):
     dropper_log_path_linux = "/tmp/user-1562"
     monkey_log_path_windows = "%temp%\\~df1563.tmp"
     monkey_log_path_linux = "/tmp/user-1563"
-    send_log_to_server = True
 
     ###########################
     # dropper config

diff --git a/monkey/infection_monkey/example.conf b/monkey/infection_monkey/example.conf
@@ -50,7 +50,6 @@
   "max_iterations": 3,
   "monkey_log_path_windows": "%temp%\\~df1563.tmp",
   "monkey_log_path_linux": "/tmp/user-1563",
-  "send_log_to_server": true,
   "ms08_067_exploit_attempts": 5,
   "user_to_add": "Monkey_IUSER_SUPPORT",
   "ping_scan_timeout": 10000,

diff --git a/monkey/infection_monkey/monkey.py b/monkey/infection_monkey/monkey.py
@@ -323,8 +323,7 @@ def cleanup(self):
             ).send()  # Signal the server (before closing the tunnel)
             InfectionMonkey.close_tunnel()
             firewall.close()
-            if WormConfiguration.send_log_to_server:
-                self.send_log()
+            self.send_log()
             self._singleton.unlock()
 
         InfectionMonkey.self_delete()

diff --git a/monkey/monkey_island/cc/services/config_schema/internal.py b/monkey/monkey_island/cc/services/config_schema/internal.py
@@ -302,13 +302,6 @@
                     "default": "%temp%\\~df1563.tmp",
                     "description": "The fullpath of the monkey log file on Windows",
                 },
-                "send_log_to_server": {
-                    "title": "Send log to server",
-                    "type": "boolean",
-                    "default": True,
-                    "description": "Determines whether the monkey sends its log to the Monkey "
-                    "Island server",
-                },
             },
         },
         "exploits": {

diff --git a/monkey/tests/data_for_tests/monkey_configs/monkey_config_standard.json b/monkey/tests/data_for_tests/monkey_configs/monkey_config_standard.json
@@ -126,8 +126,7 @@
         "dropper_log_path_linux": "/tmp/user-1562",
         "dropper_log_path_windows": "%temp%\\~df1562.tmp",
         "monkey_log_path_linux": "/tmp/user-1563",
-        "monkey_log_path_windows": "%temp%\\~df1563.tmp",
-        "send_log_to_server": true
+        "monkey_log_path_windows": "%temp%\\~df1563.tmp"
       },
       "exploits": {
         "exploit_lm_hash_list": [],