From eb1cb9170487cf60e08dad25bcfb6758e131346b Mon Sep 17 00:00:00 2001
From: VakarisZ <vakarisz@yahoo.com>
Date: Wed, 20 Mar 2019 09:33:10 +0200
Subject: [PATCH] Removed monkey dir paths from island's configuration
---
monkey/infection_monkey/config.py | 7 ++++---
monkey/monkey_island/cc/services/config_schema.py | 14 +-------------
2 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/monkey/infection_monkey/config.py b/monkey/infection_monkey/config.py
index 5d6fba356..723806388 100644
--- a/monkey/infection_monkey/config.py
+++ b/monkey/infection_monkey/config.py
@@ -107,9 +107,6 @@ class Configuration(object):
dropper_target_path_win_32 = r"C:\Windows\monkey32.exe"
dropper_target_path_win_64 = r"C:\Windows\monkey64.exe"
dropper_target_path_linux = '/tmp/monkey'
- # Monkey dir paths
- monkey_dir_linux = '/tmp/monkey_dir'
- monkey_dir_windows = r'C:\Windows\temp\monkey_dir'
###########################
# Kill file
@@ -164,6 +161,10 @@ class Configuration(object):
keep_tunnel_open_time = 60
+ # Monkey files directories
+ monkey_dir_linux = '/tmp/monkey_dir'
+ monkey_dir_windows = r'C:\Windows\Temp\monkey_dir'
+
###########################
# scanners config
###########################
diff --git a/monkey/monkey_island/cc/services/config_schema.py b/monkey/monkey_island/cc/services/config_schema.py
index cbcc6ba0a..8d99540bf 100644
--- a/monkey/monkey_island/cc/services/config_schema.py
+++ b/monkey/monkey_island/cc/services/config_schema.py
@@ -423,19 +423,7 @@ SCHEMA = {
"type": "integer",
"default": 60,
"description": "Time to keep tunnel open before going down after last exploit (in seconds)"
- },
- "monkey_dir_windows": {
- "title": "Monkey's windows directory",
- "type": "string",
- "default": r"C:\Windows\temp\monkey_dir",
- "description": "Directory containing all monkey files on windows"
- },
- "monkey_dir_linux": {
- "title": "Monkey's linux directory",
- "type": "string",
- "default": "/tmp/monkey_dir",
- "description": "Directory containing all monkey files on linux"
- },
+ }
}
},
"classes": {