From a8059f021aa182033cccd32ae043689ac544f4aa Mon Sep 17 00:00:00 2001
From: Shreya Malviya <shreya.malviya@gmail.com>
Date: Fri, 11 Feb 2022 22:36:37 +0530
Subject: [PATCH] Island: Change config schema for process list collection

---
 .../config_schema/definitions/post_breach_actions.py     | 8 ++++++++
 .../definitions/system_info_collector_classes.py         | 9 ---------
 monkey/monkey_island/cc/services/config_schema/monkey.py | 3 +--
 .../system_info_telemetry_dispatcher.py                  | 5 +----
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/monkey/monkey_island/cc/services/config_schema/definitions/post_breach_actions.py b/monkey/monkey_island/cc/services/config_schema/definitions/post_breach_actions.py
index 7d62ac36e..e76b2c254 100644
--- a/monkey/monkey_island/cc/services/config_schema/definitions/post_breach_actions.py
+++ b/monkey/monkey_island/cc/services/config_schema/definitions/post_breach_actions.py
@@ -94,5 +94,13 @@ POST_BREACH_ACTIONS = {
             "info": "Attempts to clear the command history.",
             "attack_techniques": ["T1146"],
         },
+        {
+            "type": "string",
+            "enum": ["ProcessListCollection"],
+            "title": "Process List Collector",
+            "safe": True,
+            "info": "Collects a list of running processes on the machine.",
+            "attack_techniques": ["T1082"],
+        },
     ],
 }
diff --git a/monkey/monkey_island/cc/services/config_schema/definitions/system_info_collector_classes.py b/monkey/monkey_island/cc/services/config_schema/definitions/system_info_collector_classes.py
index 5e446513c..2f8c38ee8 100644
--- a/monkey/monkey_island/cc/services/config_schema/definitions/system_info_collector_classes.py
+++ b/monkey/monkey_island/cc/services/config_schema/definitions/system_info_collector_classes.py
@@ -1,6 +1,5 @@
 from common.common_consts.system_info_collectors_names import (
     MIMIKATZ_COLLECTOR,
-    PROCESS_LIST_COLLECTOR,
 )
 
 SYSTEM_INFO_COLLECTOR_CLASSES = {
@@ -16,13 +15,5 @@ SYSTEM_INFO_COLLECTOR_CLASSES = {
             "info": "Collects credentials from Windows credential manager.",
             "attack_techniques": ["T1003", "T1005"],
         },
-        {
-            "type": "string",
-            "enum": [PROCESS_LIST_COLLECTOR],
-            "title": "Process List Collector",
-            "safe": True,
-            "info": "Collects a list of running processes on the machine.",
-            "attack_techniques": ["T1082"],
-        },
     ],
 }
diff --git a/monkey/monkey_island/cc/services/config_schema/monkey.py b/monkey/monkey_island/cc/services/config_schema/monkey.py
index 80719d4c2..ba5c88661 100644
--- a/monkey/monkey_island/cc/services/config_schema/monkey.py
+++ b/monkey/monkey_island/cc/services/config_schema/monkey.py
@@ -1,6 +1,5 @@
 from common.common_consts.system_info_collectors_names import (
     MIMIKATZ_COLLECTOR,
-    PROCESS_LIST_COLLECTOR,
 )
 
 MONKEY = {
@@ -71,6 +70,7 @@ MONKEY = {
                         "ScheduleJobs",
                         "Timestomping",
                         "AccountDiscovery",
+                        "ProcessListCollection",
                     ],
                 },
             },
@@ -85,7 +85,6 @@ MONKEY = {
                     "uniqueItems": True,
                     "items": {"$ref": "#/definitions/system_info_collector_classes"},
                     "default": [
-                        PROCESS_LIST_COLLECTOR,
                         MIMIKATZ_COLLECTOR,
                     ],
                 },
diff --git a/monkey/monkey_island/cc/services/telemetry/processing/system_info_collectors/system_info_telemetry_dispatcher.py b/monkey/monkey_island/cc/services/telemetry/processing/system_info_collectors/system_info_telemetry_dispatcher.py
index 13e0a9298..9df25a677 100644
--- a/monkey/monkey_island/cc/services/telemetry/processing/system_info_collectors/system_info_telemetry_dispatcher.py
+++ b/monkey/monkey_island/cc/services/telemetry/processing/system_info_collectors/system_info_telemetry_dispatcher.py
@@ -1,16 +1,13 @@
 import logging
 import typing
 
-from common.common_consts.system_info_collectors_names import PROCESS_LIST_COLLECTOR
 from monkey_island.cc.services.telemetry.zero_trust_checks.antivirus_existence import (
     check_antivirus_existence,
 )
 
 logger = logging.getLogger(__name__)
 
-SYSTEM_INFO_COLLECTOR_TO_TELEMETRY_PROCESSORS = {
-    PROCESS_LIST_COLLECTOR: [check_antivirus_existence],
-}
+SYSTEM_INFO_COLLECTOR_TO_TELEMETRY_PROCESSORS = {}
 
 
 class SystemInfoTelemetryDispatcher(object):