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

island: Do not start bootloader server if --setup-only is passed

This commit is contained in:
Mike Salvatore 2021-06-02 19:22:26 -04:00
parent 1c73a154bc
commit 4a1653ed5f
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,9 +50,7 @@ def run_monkey_island():
connect_to_mongodb() connect_to_mongodb()
bootloader_server_thread = _start_bootloader_server(MONGO_URL)
_start_island_server(island_args.setup_only, config_options) _start_island_server(island_args.setup_only, config_options)
bootloader_server_thread.join()
def _configure_logging(config_options): def _configure_logging(config_options):
@ -67,16 +65,6 @@ def _initialize_global_resources(config_options: IslandConfigOptions, server_con
initialize_services(config_options.data_dir) initialize_services(config_options.data_dir)
def _start_bootloader_server(mongo_url) -> Thread:
bootloader_server_thread = Thread(
target=BootloaderHttpServer(mongo_url).serve_forever, daemon=True
)
bootloader_server_thread.start()
return bootloader_server_thread
def _start_island_server(should_setup_only, config_options: IslandConfigOptions): def _start_island_server(should_setup_only, config_options: IslandConfigOptions):
populate_exporter_list() populate_exporter_list()
app = init_app(MONGO_URL) app = init_app(MONGO_URL)
@ -90,6 +78,8 @@ def _start_island_server(should_setup_only, config_options: IslandConfigOptions)
logger.warning("Setup only flag passed. Exiting.") logger.warning("Setup only flag passed. Exiting.")
return return
bootloader_server_thread = _start_bootloader_server(MONGO_URL)
if env_singleton.env.is_debug(): if env_singleton.env.is_debug():
app.run(host="0.0.0.0", debug=True, ssl_context=(crt_path, key_path)) app.run(host="0.0.0.0", debug=True, ssl_context=(crt_path, key_path))
else: else:
@ -102,6 +92,18 @@ def _start_island_server(should_setup_only, config_options: IslandConfigOptions)
_log_init_info() _log_init_info()
http_server.serve_forever() http_server.serve_forever()
bootloader_server_thread.join()
def _start_bootloader_server(mongo_url) -> Thread:
bootloader_server_thread = Thread(
target=BootloaderHttpServer(mongo_url).serve_forever, daemon=True
)
bootloader_server_thread.start()
return bootloader_server_thread
def _log_init_info(): def _log_init_info():
logger.info("Monkey Island Server is running!") logger.info("Monkey Island Server is running!")