p15693087
/
monkey
forked from p15670423/monkey
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Merge pull request #2321 from guardicore/2294-clear-repositories-on-clear-simulation 

Clear repositories on CLEAR_SIMULATION_DATA event
This commit is contained in:
Mike Salvatore 2022-09-20 07:56:31 -04:00 committed by GitHub
parent e5a1a5dc67 5032588c23
commit e3adae03b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
monkey/monkey_island/cc/server_setup.py
View File

@ -65,12 +65,14 @@ def run_monkey_island():
ip_addresses, deployment, version = _collect_system_info() ip_addresses, deployment, version = _collect_system_info()
_send_analytics(deployment, version) _send_analytics(deployment, version)
_initialize_mongodb_connection(config_options.start_mongodb, config_options.data_dir)
container = _initialize_di_container(ip_addresses, version, config_options.data_dir) container = _initialize_di_container(ip_addresses, version, config_options.data_dir)
setup_island_event_handlers(container) setup_island_event_handlers(container)
setup_agent_event_handlers(container) setup_agent_event_handlers(container)
_setup_agent_event_serializers(container) _setup_agent_event_serializers(container)
_initialize_mongodb_connection(config_options.start_mongodb, config_options.data_dir)
_start_island_server(ip_addresses, island_args.setup_only, config_options, container) _start_island_server(ip_addresses, island_args.setup_only, config_options, container)

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

@ -24,13 +24,19 @@ from monkey_island.cc.repository import (
IAgentBinaryRepository, IAgentBinaryRepository,
IAgentConfigurationRepository, IAgentConfigurationRepository,
IAgentEventRepository, IAgentEventRepository,
IAgentRepository,
ICredentialsRepository, ICredentialsRepository,
IFileRepository, IFileRepository,
IMachineRepository,
INodeRepository,
ISimulationRepository, ISimulationRepository,
IUserRepository, IUserRepository,
JSONFileUserRepository, JSONFileUserRepository,
LocalStorageFileRepository, LocalStorageFileRepository,
MongoAgentRepository,
MongoCredentialsRepository, MongoCredentialsRepository,
MongoMachineRepository,
MongoNodeRepository,
RetrievalError, RetrievalError,
StubbedEventRepository, StubbedEventRepository,
) )
@ -104,6 +110,10 @@ def _register_repositories(container: DIContainer, data_dir: Path):
# TODO: Replace with MongoEventRepository # TODO: Replace with MongoEventRepository
container.register_instance(IAgentEventRepository, StubbedEventRepository()) container.register_instance(IAgentEventRepository, StubbedEventRepository())
container.register_instance(INodeRepository, container.resolve(MongoNodeRepository))
container.register_instance(IMachineRepository, container.resolve(MongoMachineRepository))
container.register_instance(IAgentRepository, container.resolve(MongoAgentRepository))
def _decorate_file_repository(file_repository: IFileRepository) -> IFileRepository: def _decorate_file_repository(file_repository: IFileRepository) -> IFileRepository:
return FileRepositoryLockingDecorator( return FileRepositoryLockingDecorator(

17
monkey/monkey_island/cc/setup/island_event_handlers.py
View File

@ -3,7 +3,13 @@ from functools import partial
from common import DIContainer from common import DIContainer
from monkey_island.cc.event_queue import IIslandEventQueue, IslandEventTopic from monkey_island.cc.event_queue import IIslandEventQueue, IslandEventTopic
from monkey_island.cc.island_event_handlers import reset_agent_configuration from monkey_island.cc.island_event_handlers import reset_agent_configuration
from monkey_island.cc.repository import ICredentialsRepository from monkey_island.cc.repository import (
IAgentEventRepository,
IAgentRepository,
ICredentialsRepository,
IMachineRepository,
INodeRepository,
)
from monkey_island.cc.services.database import Database from monkey_island.cc.services.database import Database
@ -32,3 +38,12 @@ def _subscribe_clear_simulation_data_events(
island_event_queue.subscribe( island_event_queue.subscribe(
IslandEventTopic.CLEAR_SIMULATION_DATA, credentials_repository.remove_stolen_credentials IslandEventTopic.CLEAR_SIMULATION_DATA, credentials_repository.remove_stolen_credentials
) )
for i_repository in [
INodeRepository,
IAgentEventRepository,
IAgentRepository,
IMachineRepository,
]:
repository = container.resolve(i_repository)
island_event_queue.subscribe(IslandEventTopic.CLEAR_SIMULATION_DATA, repository.reset)