From 7f3304d79a9626ea2913c07309f400d2fcf4889f Mon Sep 17 00:00:00 2001 From: Shreya Malviya Date: Thu, 9 Jun 2022 14:54:41 -0700 Subject: [PATCH 1/4] Agent: Remove AWS fields from sensitive fields --- monkey/infection_monkey/config.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/monkey/infection_monkey/config.py b/monkey/infection_monkey/config.py index cdcf47130..0a64f51da 100644 --- a/monkey/infection_monkey/config.py +++ b/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" From bb7bacc56f186269ba6d34fd24262fea273d23c0 Mon Sep 17 00:00:00 2001 From: Shreya Malviya Date: Thu, 9 Jun 2022 14:56:25 -0700 Subject: [PATCH 2/4] Island: Remove AWS config options --- monkey/monkey_island/cc/services/config.py | 4 ---- .../cc/services/config_schema/internal.py | 14 -------------- 2 files changed, 18 deletions(-) diff --git a/monkey/monkey_island/cc/services/config.py b/monkey/monkey_island/cc/services/config.py index afc4742ba..ee4feea90 100644 --- a/monkey/monkey_island/cc/services/config.py +++ b/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 = [ diff --git a/monkey/monkey_island/cc/services/config_schema/internal.py b/monkey/monkey_island/cc/services/config_schema/internal.py index 906f7520f..e16a124b8 100644 --- a/monkey/monkey_island/cc/services/config_schema/internal.py +++ b/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", From 000620f874120440d5b44801cc809536c77324a6 Mon Sep 17 00:00:00 2001 From: Shreya Malviya Date: Thu, 9 Jun 2022 14:58:31 -0700 Subject: [PATCH 3/4] Common: Remove AWS_KEYS_PATH constant --- monkey/common/config_value_paths.py | 1 - 1 file changed, 1 deletion(-) diff --git a/monkey/common/config_value_paths.py b/monkey/common/config_value_paths.py index 5edb7a8b9..8aaf16d55 100644 --- a/monkey/common/config_value_paths.py +++ b/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"] From 61e3d71968db2ab4be6efc8bab697660c0173452 Mon Sep 17 00:00:00 2001 From: Shreya Malviya Date: Thu, 9 Jun 2022 14:59:31 -0700 Subject: [PATCH 4/4] UT: Remove AWS config fields from data for tests --- .../tests/data_for_tests/monkey_configs/flat_config.json | 3 --- .../monkey_configs/monkey_config_standard.json | 8 -------- 2 files changed, 11 deletions(-) diff --git a/monkey/tests/data_for_tests/monkey_configs/flat_config.json b/monkey/tests/data_for_tests/monkey_configs/flat_config.json index c1b924439..a20a39a5e 100644 --- a/monkey/tests/data_for_tests/monkey_configs/flat_config.json +++ b/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" 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 index f62cb5dcb..47aef8d69 100644 --- a/monkey/tests/data_for_tests/monkey_configs/monkey_config_standard.json +++ b/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",