Merge branch '3244-enable-random-hash-in-agent' into develop

Issue #3244 PR #3345
guardicore · May 16, 2023 · 1b20771 · 1b20771
2 parents 699e97a + d40dea2
commit 1b20771
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 18 deletions.
diff --git a/envs/monkey_zoo/blackbox/test_configurations/noop.py b/envs/monkey_zoo/blackbox/test_configurations/noop.py
@@ -6,6 +6,7 @@
     ExploitationOptionsConfiguration,
     ICMPScanConfiguration,
     NetworkScanConfiguration,
+    PolymorphismConfiguration,
     PropagationConfiguration,
     ScanTargetConfiguration,
     TCPScanConfiguration,
@@ -37,11 +38,16 @@
     exploitation=_exploitation_configuration,
 )
 
+_polymorphism_configuration = PolymorphismConfiguration(
+    randomize_agent_hash=False,
+)
+
 _agent_configuration = AgentConfiguration(
     keep_tunnel_open_time=0,
     credentials_collectors={},
     payloads={},
     propagation=_propagation_configuration,
+    polymorphism=_polymorphism_configuration,
 )
 _propagation_credentials: Tuple[Credentials, ...] = tuple()
 

diff --git a/monkey/common/agent_configuration/__init__.py b/monkey/common/agent_configuration/__init__.py
@@ -1,13 +1,14 @@
 from .agent_configuration import AgentConfiguration
 from .agent_sub_configurations import (
-    PluginConfiguration,
-    ScanTargetConfiguration,
+    ExploitationConfiguration,
+    ExploitationOptionsConfiguration,
     ICMPScanConfiguration,
-    TCPScanConfiguration,
     NetworkScanConfiguration,
-    ExploitationOptionsConfiguration,
-    ExploitationConfiguration,
+    PluginConfiguration,
+    PolymorphismConfiguration,
     PropagationConfiguration,
+    ScanTargetConfiguration,
+    TCPScanConfiguration,
 )
 from .default_agent_configuration import (
     DEFAULT_AGENT_CONFIGURATION,

diff --git a/monkey/common/agent_configuration/agent_sub_configurations.py b/monkey/common/agent_configuration/agent_sub_configurations.py
@@ -249,11 +249,11 @@ class PolymorphismConfiguration(MutableInfectionMonkeyBaseModel):
     A configuration for polymorphism
 
     Attributes:
-        :param randomized_agent_hash: If true, the Agent will emulate the property of polymorphism
+        :param randomize_agent_hash: If true, the Agent will emulate the property of polymorphism
                                       that all copies have unique hashes
     """
 
-    randomized_agent_hash: bool = Field(
+    randomize_agent_hash: bool = Field(
         title="Randomize Agent hash",
         description="Emulate the property of polymorphic (or metamorphic) malware that all "
         "copies have unique hashes.",

diff --git a/monkey/common/agent_configuration/default_agent_configuration.py b/monkey/common/agent_configuration/default_agent_configuration.py
@@ -93,7 +93,7 @@
     credentials_collectors=CREDENTIALS_COLLECTORS,
     payloads=PAYLOAD_CONFIGURATION,
     propagation=PROPAGATION_CONFIGURATION,
-    polymorphism=PolymorphismConfiguration(randomized_agent_hash=False),
+    polymorphism=PolymorphismConfiguration(randomize_agent_hash=False),
 )
 
 DEFAULT_RANSOMWARE_AGENT_CONFIGURATION = deepcopy(DEFAULT_AGENT_CONFIGURATION)

diff --git a/monkey/infection_monkey/monkey.py b/monkey/infection_monkey/monkey.py
@@ -48,7 +48,9 @@
 from infection_monkey.exploit import (
     CachingAgentBinaryRepository,
     ExploiterWrapper,
+    IAgentBinaryRepository,
     IslandAPIAgentOTPProvider,
+    PolymorphicAgentBinaryRepositoryDecorator,
 )
 from infection_monkey.exploit.log4shell import Log4ShellExploiter
 from infection_monkey.exploit.mssqlexec import MSSQLExploiter
@@ -378,10 +380,7 @@ def _build_puppet(self, operating_system: OperatingSystem) -> IPuppet:
         #           insecure permissions.
         logger.debug(f"Created {self._plugin_dir} to store agent plugins")
 
-        agent_binary_repository = CachingAgentBinaryRepository(
-            island_api_client=self._island_api_client,
-            manager=self._manager,
-        )
+        agent_binary_repository = self._build_agent_binary_repository()
 
         plugin_source_extractor = PluginSourceExtractor(self._plugin_dir)
         plugin_loader = PluginLoader(
@@ -461,6 +460,20 @@ def _build_puppet(self, operating_system: OperatingSystem) -> IPuppet:
 
         return puppet
 
+    def _build_agent_binary_repository(self) -> IAgentBinaryRepository:
+        agent_configuration = self._island_api_client.get_config()
+        agent_binary_repository: IAgentBinaryRepository = CachingAgentBinaryRepository(
+            island_api_client=self._island_api_client,
+            manager=self._manager,
+        )
+
+        if agent_configuration.polymorphism.randomize_agent_hash:
+            agent_binary_repository = PolymorphicAgentBinaryRepositoryDecorator(
+                agent_binary_repository
+            )
+
+        return agent_binary_repository
+
     def _subscribe_events(self):
         self._agent_event_queue.subscribe_type(
             CredentialsStolenEvent,

diff --git a/monkey/monkey_island/cc/ui/src/components/configuration-components/UiSchema.js b/monkey/monkey_island/cc/ui/src/components/configuration-components/UiSchema.js
@@ -117,7 +117,7 @@ export default function UiSchema(props) {
       }
     },
     polymorphism: {
-      randomized_agent_hash: {
+      randomize_agent_hash: {
         'ui:widget': CheckboxWithMessage
       }
     }

diff --git a/monkey/monkey_island/cc/ui/src/services/configuration/polymorphism.js b/monkey/monkey_island/cc/ui/src/services/configuration/polymorphism.js
@@ -1,7 +1,7 @@
 const POLYMORPHISM_SCHEMA = {
   'title': 'Polymorphism',
   'properties': {
-    'randomized_agent_hash': {
+    'randomize_agent_hash': {
       'title': 'Randomize Agent hash',
       'type': 'boolean',
       'default': false

diff --git a/monkey/tests/common/example_agent_configuration.py b/monkey/tests/common/example_agent_configuration.py
@@ -46,7 +46,7 @@
     "credentials_collectors": {"SSHCollector": {}, "MimikatzCollector": {}}
 }
 
-POLYMORPHISM_CONFIGURATION = {"randomized_agent_hash": False}
+POLYMORPHISM_CONFIGURATION = {"randomize_agent_hash": False}
 
 AGENT_CONFIGURATION = {
     "keep_tunnel_open_time": 30,

diff --git a/...tests/unit_tests/infection_monkey/island_api_client/configuration_validation_constants.py b/...tests/unit_tests/infection_monkey/island_api_client/configuration_validation_constants.py
@@ -308,15 +308,15 @@
         },
         "PolymorphismConfiguration": {
             "title": "PolymorphismConfiguration",
-            "description": "A configuration for polymorphism\n\nAttributes:\n    :param randomized_agent_hash: If true, the Agent will emulate the property of polymorphism that all copies have unique hashes",
+            "description": "A configuration for polymorphism\n\nAttributes:\n    :param randomize_agent_hash: If true, the Agent will emulate the property of polymorphism that all copies have unique hashes",
             "type": "object",
             "properties": {
-                "randomized_agent_hash": {
+                "randomize_agent_hash": {
                     "title": "Randomize Agent hash",
                     "default": False,
                 },
             },
-            "required": ["randomized_agent_hash"],
+            "required": ["randomize_agent_hash"],
             "additionalProperties": False,
         },
     },