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

island: Expand environment variables in data_dir

This commit is contained in:
Mike Salvatore 2021-06-01 03:35:33 -04:00
parent 0ab20d558b
commit c761dba030
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
monkey/monkey_island/setup/island_config_options.py
View File

@ -11,8 +11,9 @@ from monkey_island.cc.server_utils.consts import (
class IslandConfigOptions: class IslandConfigOptions:
def __init__(self, config_contents: dict): def __init__(self, config_contents: dict):
self.data_dir = os.path.expanduser(config_contents.get("data_dir", DEFAULT_DATA_DIR)) self.data_dir = os.path.expandvars(
os.path.expanduser(config_contents.get("data_dir", DEFAULT_DATA_DIR))
)
self.log_level = config_contents.get("log_level", DEFAULT_LOG_LEVEL) self.log_level = config_contents.get("log_level", DEFAULT_LOG_LEVEL)
self.start_mongodb = config_contents.get( self.start_mongodb = config_contents.get(

9
monkey/tests/unit_tests/monkey_island/setup/test_island_config_options.py
View File

@ -52,3 +52,12 @@ def test_island_config_options__data_dir_expanduser(monkeypatch, tmpdir):
options = IslandConfigOptions({"data_dir": f"~/{DATA_DIR_NAME}"}) options = IslandConfigOptions({"data_dir": f"~/{DATA_DIR_NAME}"})
assert options.data_dir == os.path.join(tmpdir, DATA_DIR_NAME) assert options.data_dir == os.path.join(tmpdir, DATA_DIR_NAME)
def test_island_config_options__data_dir_expandvars(monkeypatch, tmpdir):
set_home_env(monkeypatch, tmpdir)
DATA_DIR_NAME = "test_data_dir"
options = IslandConfigOptions({"data_dir": f"$HOME/{DATA_DIR_NAME}"})
assert options.data_dir == os.path.join(tmpdir, DATA_DIR_NAME)