Removed "Monkey island" config tab (moved everything into internal)

monkey/monkey_island/cc/services/attack/technique_reports/T1065.py

@@ -14,6 +14,6 @@ class T1065(AttackTechnique):
 
     @staticmethod
     def get_report_data():
-        port = ConfigService.get_config_value(['cnc', 'servers', 'current_server']).split(':')[1]
+        port = ConfigService.get_config_value(['internal', 'island_server', 'current_server']).split(':')[1]
         T1065.used_msg = T1065.message % port
         return T1065.get_base_data_by_status(ScanStatus.USED.value)

monkey/monkey_island/cc/services/config.py

@@ -218,8 +218,8 @@ class ConfigService:
     @staticmethod
     def set_server_ips_in_config(config):
         ips = local_ip_addresses()
-        config["cnc"]["servers"]["command_servers"] = ["%s:%d" % (ip, env_singleton.env.get_island_port()) for ip in ips]
+        config["internal"]["island_server"]["command_servers"] = ["%s:%d" % (ip, env_singleton.env.get_island_port()) for ip in ips]
-        config["cnc"]["servers"]["current_server"] = "%s:%d" % (ips[0], env_singleton.env.get_island_port())
+        config["internal"]["island_server"]["current_server"] = "%s:%d" % (ips[0], env_singleton.env.get_island_port())
 
     @staticmethod
     def save_initial_config_if_needed():

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

@@ -1,45 +0,0 @@
-CNC = {
-    "title": "Monkey Island",
-    "type": "object",
-    "properties": {
-        "servers": {
-            "title": "Servers",
-            "type": "object",
-            "properties": {
-                "command_servers": {
-                    "title": "Command servers",
-                    "type": "array",
-                    "uniqueItems": True,
-                    "items": {
-                        "type": "string"
-                    },
-                    "default": [
-                        "192.0.2.0:5000"
-                    ],
-                    "description": "List of command servers to try and communicate with (format is <ip>:<port>)"
-                },
-                "internet_services": {
-                    "title": "Internet services",
-                    "type": "array",
-                    "uniqueItems": True,
-                    "items": {
-                        "type": "string"
-                    },
-                    "default": [
-                        "monkey.guardicore.com",
-                        "www.google.com"
-                    ],
-                    "description":
-                        "List of internet services to try and communicate with to determine internet"
-                        " connectivity (use either ip or domain)"
-                },
-                "current_server": {
-                    "title": "Current server",
-                    "type": "string",
-                    "default": "192.0.2.0:5000",
-                    "description": "The current command server the monkey is communicating with"
-                }
-            }
-        },
-    }
-}

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

@@ -1,6 +1,5 @@
 from monkey_island.cc.services.config_schema.basic import BASIC
 from monkey_island.cc.services.config_schema.basic_network import BASIC_NETWORK
-from monkey_island.cc.services.config_schema.cnc import CNC
 from monkey_island.cc.services.config_schema.definitions.exploiter_classes import EXPLOITER_CLASSES
 from monkey_island.cc.services.config_schema.definitions.finger_classes import FINGER_CLASSES
 from monkey_island.cc.services.config_schema.definitions.post_breach_actions import POST_BREACH_ACTIONS
@@ -26,7 +25,6 @@ SCHEMA = {
         "basic_network": BASIC_NETWORK,
         "monkey": MONKEY,
         "internal": INTERNAL,
-        "cnc": CNC,
         "exploits": EXPLOITS,
         "network": NETWORK
     },

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

@@ -38,6 +38,21 @@ INTERNAL = {
             "title": "Monkey",
             "type": "object",
             "properties": {
+                "internet_services": {
+                    "title": "Internet services",
+                    "type": "array",
+                    "uniqueItems": True,
+                    "items": {
+                        "type": "string"
+                    },
+                    "default": [
+                        "monkey.guardicore.com",
+                        "www.google.com"
+                    ],
+                    "description":
+                        "List of internet services to try and communicate with to determine internet"
+                        " connectivity (use either ip or domain)"
+                },
                 "self_delete_in_cleanup": {
                     "title": "Self delete on cleanup",
                     "type": "boolean",
@@ -64,6 +79,31 @@ INTERNAL = {
                 }
             }
         },
+        "island_server": {
+            "title": "Island server",
+            "type": "object",
+            "properties": {
+                "command_servers": {
+                    "title": "Island server's IP's",
+                    "type": "array",
+                    "uniqueItems": True,
+                    "items": {
+                        "type": "string"
+                    },
+                    "default": [
+                        "192.0.2.0:5000"
+                    ],
+                    "description": "List of command servers/network interfaces to try to communicate with "
+                                   "(format is <ip>:<port>)"
+                },
+                "current_server": {
+                    "title": "Current server",
+                    "type": "string",
+                    "default": "192.0.2.0:5000",
+                    "description": "The current command server the monkey is communicating with"
+                }
+            }
+        },
         "classes": {
             "title": "Classes",
             "type": "object",