From e4edfd8ded977272a9ed893e8b23030acebe6813 Mon Sep 17 00:00:00 2001 From: Mike Salvatore Date: Tue, 5 Jul 2022 14:41:59 -0400 Subject: [PATCH] Agent: Remove shallow i_puppet.credential_collection subpackage --- .../mimikatz_collector/mimikatz_credential_collector.py | 2 +- .../ssh_collector/ssh_credential_collector.py | 2 +- monkey/infection_monkey/i_puppet/__init__.py | 1 + .../infection_monkey/i_puppet/credential_collection/__init__.py | 1 - .../{credential_collection => }/i_credential_collector.py | 0 5 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 monkey/infection_monkey/i_puppet/credential_collection/__init__.py rename monkey/infection_monkey/i_puppet/{credential_collection => }/i_credential_collector.py (100%) diff --git a/monkey/infection_monkey/credential_collectors/mimikatz_collector/mimikatz_credential_collector.py b/monkey/infection_monkey/credential_collectors/mimikatz_collector/mimikatz_credential_collector.py index 9dc590aeb..3404479a4 100644 --- a/monkey/infection_monkey/credential_collectors/mimikatz_collector/mimikatz_credential_collector.py +++ b/monkey/infection_monkey/credential_collectors/mimikatz_collector/mimikatz_credential_collector.py @@ -2,7 +2,7 @@ import logging from typing import Sequence from common.credentials import Credentials, LMHash, NTHash, Password, Username -from infection_monkey.i_puppet.credential_collection import ICredentialCollector +from infection_monkey.i_puppet import ICredentialCollector from infection_monkey.model import USERNAME_PREFIX from . import pypykatz_handler diff --git a/monkey/infection_monkey/credential_collectors/ssh_collector/ssh_credential_collector.py b/monkey/infection_monkey/credential_collectors/ssh_collector/ssh_credential_collector.py index 35bd401f4..a5f15a637 100644 --- a/monkey/infection_monkey/credential_collectors/ssh_collector/ssh_credential_collector.py +++ b/monkey/infection_monkey/credential_collectors/ssh_collector/ssh_credential_collector.py @@ -3,7 +3,7 @@ from typing import Dict, Iterable, Sequence from common.credentials import Credentials, SSHKeypair, Username from infection_monkey.credential_collectors.ssh_collector import ssh_handler -from infection_monkey.i_puppet.credential_collection import ICredentialCollector +from infection_monkey.i_puppet import ICredentialCollector from infection_monkey.telemetry.messengers.i_telemetry_messenger import ITelemetryMessenger logger = logging.getLogger(__name__) diff --git a/monkey/infection_monkey/i_puppet/__init__.py b/monkey/infection_monkey/i_puppet/__init__.py index c4e6b5b1c..5aeb265f3 100644 --- a/monkey/infection_monkey/i_puppet/__init__.py +++ b/monkey/infection_monkey/i_puppet/__init__.py @@ -10,3 +10,4 @@ from .i_puppet import ( UnknownPluginError, ) from .i_fingerprinter import IFingerprinter +from .i_credential_collector import ICredentialCollector diff --git a/monkey/infection_monkey/i_puppet/credential_collection/__init__.py b/monkey/infection_monkey/i_puppet/credential_collection/__init__.py deleted file mode 100644 index ba2c18466..000000000 --- a/monkey/infection_monkey/i_puppet/credential_collection/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from .i_credential_collector import ICredentialCollector diff --git a/monkey/infection_monkey/i_puppet/credential_collection/i_credential_collector.py b/monkey/infection_monkey/i_puppet/i_credential_collector.py similarity index 100% rename from monkey/infection_monkey/i_puppet/credential_collection/i_credential_collector.py rename to monkey/infection_monkey/i_puppet/i_credential_collector.py