From 1d79d9868951bbdc7918c682cf945f33858a418a Mon Sep 17 00:00:00 2001 From: Mike Salvatore Date: Tue, 16 Aug 2022 08:17:04 -0400 Subject: [PATCH] Agent: Rename credentials_store -> propagation_credentials_repository --- monkey/infection_monkey/monkey.py | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/monkey/infection_monkey/monkey.py b/monkey/infection_monkey/monkey.py index 3baf112c3..48cc70c67 100644 --- a/monkey/infection_monkey/monkey.py +++ b/monkey/infection_monkey/monkey.py @@ -203,12 +203,14 @@ class InfectionMonkey: control_channel = ControlChannel( self._control_client.server_address, GUID, self._control_client.proxies ) - credentials_store = AggregatingPropagationCredentialsRepository(control_channel) + propagation_credentials_repository = AggregatingPropagationCredentialsRepository( + control_channel + ) event_queue = PyPubSubEventQueue(Publisher()) - InfectionMonkey._subscribe_events(event_queue, credentials_store) + InfectionMonkey._subscribe_events(event_queue, propagation_credentials_repository) - puppet = self._build_puppet(credentials_store, event_queue) + puppet = self._build_puppet(propagation_credentials_repository, event_queue) victim_host_factory = self._build_victim_host_factory(local_network_interfaces) @@ -216,7 +218,7 @@ class InfectionMonkey: ExploitInterceptingTelemetryMessenger( self._telemetry_messenger, self._monkey_inbound_tunnel ), - credentials_store, + propagation_credentials_repository, ) self._master = AutomatedMaster( @@ -226,16 +228,19 @@ class InfectionMonkey: victim_host_factory, control_channel, local_network_interfaces, - credentials_store, + propagation_credentials_repository, ) @staticmethod def _subscribe_events( - event_queue: IEventQueue, credentials_store: IPropagationCredentialsRepository + event_queue: IEventQueue, + propagation_credentials_repository: IPropagationCredentialsRepository, ): event_queue.subscribe_type( CredentialsStolenEvent, - add_credentials_from_event_to_propagation_credentials_repository(credentials_store), + add_credentials_from_event_to_propagation_credentials_repository( + propagation_credentials_repository + ), ) @staticmethod @@ -247,7 +252,9 @@ class InfectionMonkey: return local_network_interfaces def _build_puppet( - self, credentials_store: IPropagationCredentialsRepository, event_queue: IEventQueue + self, + propagation_credentials_repository: IPropagationCredentialsRepository, + event_queue: IEventQueue, ) -> IPuppet: puppet = Puppet() @@ -290,7 +297,7 @@ class InfectionMonkey: ) zerologon_telemetry_messenger = CredentialsInterceptingTelemetryMessenger( - self._telemetry_messenger, credentials_store + self._telemetry_messenger, propagation_credentials_repository ) zerologon_wrapper = ExploiterWrapper(zerologon_telemetry_messenger, agent_repository) puppet.load_plugin(