From 0519153aaf7df97068d16e32a7e2b73cdb9c948e Mon Sep 17 00:00:00 2001 From: Mike Salvatore Date: Mon, 7 Jun 2021 13:04:38 -0400 Subject: [PATCH] island: Move _expand_path() to file_utils.py so it can be reused --- monkey/monkey_island/cc/server_utils/file_utils.py | 5 +++++ .../monkey_island/cc/setup/island_config_options.py | 13 ++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 monkey/monkey_island/cc/server_utils/file_utils.py diff --git a/monkey/monkey_island/cc/server_utils/file_utils.py b/monkey/monkey_island/cc/server_utils/file_utils.py new file mode 100644 index 000000000..225fb8732 --- /dev/null +++ b/monkey/monkey_island/cc/server_utils/file_utils.py @@ -0,0 +1,5 @@ +import os + + +def expand_path(path: str) -> str: + return os.path.expandvars(os.path.expanduser(path)) diff --git a/monkey/monkey_island/cc/setup/island_config_options.py b/monkey/monkey_island/cc/setup/island_config_options.py index c497af529..9704e5f45 100644 --- a/monkey/monkey_island/cc/setup/island_config_options.py +++ b/monkey/monkey_island/cc/setup/island_config_options.py @@ -1,7 +1,5 @@ from __future__ import annotations -import os - from monkey_island.cc.server_utils.consts import ( DEFAULT_CERTIFICATE_PATHS, DEFAULT_CRT_PATH, @@ -10,11 +8,12 @@ from monkey_island.cc.server_utils.consts import ( DEFAULT_LOG_LEVEL, DEFAULT_START_MONGO_DB, ) +from monkey_island.cc.server_utils.file_utils import expand_path class IslandConfigOptions: def __init__(self, config_contents: dict): - self.data_dir = _expand_path(config_contents.get("data_dir", DEFAULT_DATA_DIR)) + self.data_dir = expand_path(config_contents.get("data_dir", DEFAULT_DATA_DIR)) self.log_level = config_contents.get("log_level", DEFAULT_LOG_LEVEL) @@ -22,17 +21,13 @@ class IslandConfigOptions: "mongodb", {"start_mongodb": DEFAULT_START_MONGO_DB} ).get("start_mongodb", DEFAULT_START_MONGO_DB) - self.crt_path = _expand_path( + self.crt_path = expand_path( config_contents.get("ssl_certificate", DEFAULT_CERTIFICATE_PATHS).get( "ssl_certificate_file", DEFAULT_CRT_PATH ) ) - self.key_path = _expand_path( + self.key_path = expand_path( config_contents.get("ssl_certificate", DEFAULT_CERTIFICATE_PATHS).get( "ssl_certificate_key_file", DEFAULT_KEY_PATH ) ) - - -def _expand_path(path: str) -> str: - return os.path.expandvars(os.path.expanduser(path))