Merge pull request #2008 from guardicore/1994-remove-unused-aws-config-options

Remove unused AWS config fields

monkey/common/config_value_paths.py

@@ -1,4 +1,3 @@
-AWS_KEYS_PATH = ["internal", "monkey", "aws_keys"]
 EXPORT_MONKEY_TELEMS_PATH = ["internal", "testing", "export_monkey_telems"]
 CURRENT_SERVER_PATH = ["internal", "island_server", "current_server"]
 SSH_KEYS_PATH = ["internal", "exploits", "exploit_ssh_keys"]

monkey/infection_monkey/config.py

@@ -7,8 +7,6 @@ SENSITIVE_FIELDS = [
     "exploit_password_list",
     "exploit_user_list",
     "exploit_ssh_keys",
-    "aws_secret_access_key",
-    "aws_session_token",
 ]
 LOCAL_CONFIG_VARS = ["name", "id", "current_server", "max_depth"]
 HIDDEN_FIELD_REPLACEMENT_CONTENT = "hidden"

monkey/monkey_island/cc/services/config.py

@@ -9,7 +9,6 @@ from typing import Any, Dict, List
 from jsonschema import Draft4Validator, validators
 
 from common.config_value_paths import (
-    AWS_KEYS_PATH,
     EXPORT_MONKEY_TELEMS_PATH,
     LM_HASH_LIST_PATH,
     NTLM_HASH_LIST_PATH,
@@ -42,9 +41,6 @@ ENCRYPTED_CONFIG_VALUES = [
     LM_HASH_LIST_PATH,
     NTLM_HASH_LIST_PATH,
     SSH_KEYS_PATH,
-    AWS_KEYS_PATH + ["aws_access_key_id"],
-    AWS_KEYS_PATH + ["aws_secret_access_key"],
-    AWS_KEYS_PATH + ["aws_session_token"],
 ]
 
 SENSITIVE_SSH_KEY_FIELDS = [

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

@@ -15,20 +15,6 @@ INTERNAL = {
                 },
             },
         },
-        "monkey": {
-            "title": "Monkey",
-            "type": "object",
-            "properties": {
-                "aws_keys": {
-                    "type": "object",
-                    "properties": {
-                        "aws_access_key_id": {"type": "string", "default": ""},
-                        "aws_secret_access_key": {"type": "string", "default": ""},
-                        "aws_session_token": {"type": "string", "default": ""},
-                    },
-                },
-            },
-        },
         "island_server": {
             "title": "Island server",
             "type": "object",

monkey/tests/data_for_tests/monkey_configs/flat_config.json

@@ -10,9 +10,6 @@
     "PBA_linux_filename": "test.sh",
     "PBA_windows_filename": "test.ps1",
     "alive": true,
-    "aws_access_key_id": "",
-    "aws_secret_access_key": "",
-    "aws_session_token": "",
     "blocked_ips": ["192.168.1.1", "192.168.1.100"],
     "command_servers": [
         "10.197.94.72:5000"

monkey/tests/data_for_tests/monkey_configs/monkey_config_standard.json

@@ -41,14 +41,6 @@
       "general": {
         "keep_tunnel_open_time": 60
       },
-      "monkey": {
-        "alive": true,
-        "aws_keys": {
-          "aws_access_key_id": "",
-          "aws_secret_access_key": "",
-          "aws_session_token": ""
-        }
-      },
       "island_server": {
         "command_servers": [
           "192.168.1.37:5000",