p15670423
/
monkey
1
0
Fork 5
Code Issues Pull Requests 3 Projects Releases Wiki Activity

Island: Use ICredentialsRepository to get configured usernames

This commit is contained in:
Mike Salvatore 2022-07-13 14:02:30 -04:00
parent 65686190dd
commit e1c5972ccc
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
monkey/monkey_island/cc/services/initialize.py
View File

@ -70,7 +70,9 @@ def initialize_services(data_dir: Path) -> DIContainer:
# This is temporary until we get DI all worked out. # This is temporary until we get DI all worked out.
ReportService.initialize( ReportService.initialize(
container.resolve(AWSService), container.resolve(IAgentConfigurationRepository) container.resolve(AWSService),
container.resolve(IAgentConfigurationRepository),
container.resolve(ICredentialsRepository),
) )
return container return container

29
monkey/monkey_island/cc/services/reporting/report.py
View File

@ -4,13 +4,14 @@ import logging
from itertools import chain, product from itertools import chain, product
from typing import List from typing import List
from common.config_value_paths import PASSWORD_LIST_PATH, USER_LIST_PATH from common.config_value_paths import PASSWORD_LIST_PATH
from common.credentials import CredentialComponentType
from common.network.network_range import NetworkRange from common.network.network_range import NetworkRange
from common.network.segmentation_utils import get_ip_in_src_and_not_in_dst from common.network.segmentation_utils import get_ip_in_src_and_not_in_dst
from monkey_island.cc.database import mongo from monkey_island.cc.database import mongo
from monkey_island.cc.models import Monkey from monkey_island.cc.models import Monkey
from monkey_island.cc.models.report import get_report, save_report from monkey_island.cc.models.report import get_report, save_report
from monkey_island.cc.repository import IAgentConfigurationRepository from monkey_island.cc.repository import IAgentConfigurationRepository, ICredentialsRepository
from monkey_island.cc.services.config import ConfigService from monkey_island.cc.services.config import ConfigService
from monkey_island.cc.services.configuration.utils import ( from monkey_island.cc.services.configuration.utils import (
get_config_network_segments_as_subnet_groups, get_config_network_segments_as_subnet_groups,
@ -43,6 +44,7 @@ class ReportService:
_aws_service = None _aws_service = None
_agent_configuration_repository = None _agent_configuration_repository = None
_credentials_repository = None
class DerivedIssueEnum: class DerivedIssueEnum:
WEAK_PASSWORD = "weak_password" WEAK_PASSWORD = "weak_password"
@ -51,10 +53,14 @@ class ReportService:
@classmethod @classmethod
def initialize( def initialize(
cls, aws_service: AWSService, agent_configuration_repository: IAgentConfigurationRepository cls,
aws_service: AWSService,
agent_configuration_repository: IAgentConfigurationRepository,
credentials_repository: ICredentialsRepository,
): ):
cls._aws_service = aws_service cls._aws_service = aws_service
cls._agent_configuration_repository = agent_configuration_repository cls._agent_configuration_repository = agent_configuration_repository
cls._credentials_repository = credentials_repository
# This should pull from Simulation entity # This should pull from Simulation entity
@staticmethod @staticmethod
@ -380,9 +386,20 @@ class ReportService:
def get_manual_monkey_hostnames(): def get_manual_monkey_hostnames():
return [monkey["hostname"] for monkey in get_manual_monkeys()] return [monkey["hostname"] for monkey in get_manual_monkeys()]
@staticmethod @classmethod
def get_config_users(): def get_config_users(cls):
return ConfigService.get_config_value(USER_LIST_PATH, True) usernames = []
configured_credentials = cls._credentials_repository.get_configured_credentials()
for credentials in configured_credentials:
usernames = chain(
usernames,
(
identity
for identity in credentials.identities
if identity.credential_type == CredentialComponentType.USERNAME
),
)
return [u.username for u in usernames]
@staticmethod @staticmethod
def get_config_passwords(): def get_config_passwords():