p20319658
/
monkey
forked from p34709852/monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Agent: Rename event_queue to agent_event_queue in SSHCredentialCollector

This commit is contained in:
Ilija Lazoroski 2022-10-05 11:37:58 +02:00
parent c7e2b91735
commit 2ece91b9df
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
monkey/infection_monkey/credential_collectors/ssh_collector/ssh_credential_collector.py
View File

@ -15,13 +15,15 @@ class SSHCredentialCollector(ICredentialCollector):
SSH keys credential collector SSH keys credential collector
""" """
def __init__(self, telemetry_messenger: ITelemetryMessenger, event_queue: IAgentEventQueue): def __init__(
self, telemetry_messenger: ITelemetryMessenger, agent_event_queue: IAgentEventQueue
):
self._telemetry_messenger = telemetry_messenger self._telemetry_messenger = telemetry_messenger
self._event_queue = event_queue self._agent_event_queue = agent_event_queue
def collect_credentials(self, _options=None) -> Sequence[Credentials]: def collect_credentials(self, _options=None) -> Sequence[Credentials]:
logger.info("Started scanning for SSH credentials") logger.info("Started scanning for SSH credentials")
ssh_info = ssh_handler.get_ssh_info(self._telemetry_messenger, self._event_queue) ssh_info = ssh_handler.get_ssh_info(self._telemetry_messenger, self._agent_event_queue)
logger.info("Finished scanning for SSH credentials") logger.info("Finished scanning for SSH credentials")
return ssh_handler.to_credentials(ssh_info) return ssh_handler.to_credentials(ssh_info)

12
monkey/infection_monkey/credential_collectors/ssh_collector/ssh_handler.py
View File

@ -34,7 +34,7 @@ SSH_COLLECTOR_EVENT_TAGS = frozenset(
def get_ssh_info( def get_ssh_info(
telemetry_messenger: ITelemetryMessenger, event_queue: IAgentEventQueue telemetry_messenger: ITelemetryMessenger, agent_event_queue: IAgentEventQueue
) -> Iterable[Dict]: ) -> Iterable[Dict]:
# TODO: Remove this check when this is turned into a plugin. # TODO: Remove this check when this is turned into a plugin.
if is_windows_os(): if is_windows_os():
@ -44,7 +44,7 @@ def get_ssh_info(
return [] return []
home_dirs = _get_home_dirs() home_dirs = _get_home_dirs()
ssh_info = _get_ssh_files(home_dirs, telemetry_messenger, event_queue) ssh_info = _get_ssh_files(home_dirs, telemetry_messenger, agent_event_queue)
return ssh_info return ssh_info
@ -85,7 +85,7 @@ def _get_ssh_struct(name: str, home_dir: str) -> Dict:
def _get_ssh_files( def _get_ssh_files(
user_info: Iterable[Dict], user_info: Iterable[Dict],
telemetry_messenger: ITelemetryMessenger, telemetry_messenger: ITelemetryMessenger,
event_queue: IAgentEventQueue, agent_event_queue: IAgentEventQueue,
) -> Iterable[Dict]: ) -> Iterable[Dict]:
for info in user_info: for info in user_info:
path = info["home_dir"] path = info["home_dir"]
@ -127,7 +127,7 @@ def _get_ssh_files(
collected_credentials = to_credentials([info]) collected_credentials = to_credentials([info])
_publish_credentials_stolen_event( _publish_credentials_stolen_event(
collected_credentials, event_queue collected_credentials, agent_event_queue
) )
else: else:
continue continue
@ -172,7 +172,7 @@ def to_credentials(ssh_info: Iterable[Dict]) -> Sequence[Credentials]:
def _publish_credentials_stolen_event( def _publish_credentials_stolen_event(
collected_credentials: Sequence[Credentials], event_queue: IAgentEventQueue collected_credentials: Sequence[Credentials], agent_event_queue: IAgentEventQueue
): ):
credentials_stolen_event = CredentialsStolenEvent( credentials_stolen_event = CredentialsStolenEvent(
source=get_agent_id(), source=get_agent_id(),
@ -180,4 +180,4 @@ def _publish_credentials_stolen_event(
stolen_credentials=collected_credentials, stolen_credentials=collected_credentials,
) )
event_queue.publish(credentials_stolen_event) agent_event_queue.publish(credentials_stolen_event)