Create data directory on Island initialisation

monkey/monkey_island.py

@@ -1,22 +1,21 @@
-from gevent import monkey as gevent_monkey
-
-from monkey_island.cc.arg_parser import parse_cli_args
-from monkey_island.setup.config_setup import setup_config_by_cmd_arg, setup_default_config
-
-gevent_monkey.patch_all()
+# This import patches other imports and needs to be first
+import monkey_island.setup.gevent_setup  # noqa: E402 F401 isort:skip
 
 import json  # noqa: E402
 
+import monkey_island.cc.environment.environment_singleton as env_singleton  # noqa: E402
+from monkey_island.cc.arg_parser import parse_cli_args
 from monkey_island.cc.server_utils.island_logger import setup_logging  # noqa: E402
+from monkey_island.setup.config_setup import setup_config_by_cmd_arg, setup_default_config
 
 if "__main__" == __name__:
     island_args = parse_cli_args()
 
     # This is here in order to catch EVERYTHING, some functions are being called on
     # imports, so the log init needs to be first.
     try:
-        if island_args.server_config:
-            config, server_config_path = setup_config_by_cmd_arg(island_args.server_config)
+        if island_args.server_config_path:
+            config, server_config_path = setup_config_by_cmd_arg(island_args.server_config_path)
         else:
             config, server_config_path = setup_default_config()
 
@@ -30,6 +29,11 @@
         print(f"Error loading server config: {ex}")
         exit(1)
 
+    # We need to initialize environment singleton before importing main,
+    # because main imports modules from monkey_island/cc/models and models need a connection to the
+    # mongodb. Mongodb connection parameters are initialized in environment singleton.
+    env_singleton.initialize_from_file(server_config_path)
+
     from monkey_island.cc.main import main  # noqa: E402
 
-    main(island_args.setup_only, island_args.server_config_path, config)
+    main(island_args.setup_only, config)

monkey/monkey_island/cc/arg_parser.py

@@ -1,18 +1,10 @@
-from monkey_island.cc.server_utils.consts import (
-    DEFAULT_SERVER_CONFIG_PATH,
-    DEFAULT_SHOULD_SETUP_ONLY,
-)
+from dataclasses import dataclass
 
 
+@dataclass
 class IslandCmdArgs:
-    setup_only: bool = DEFAULT_SHOULD_SETUP_ONLY
-    server_config_path: str = DEFAULT_SERVER_CONFIG_PATH
-
-    def __init__(self, setup_only: None, server_config_path: None):
-        if setup_only:
-            self.setup_only = setup_only
-        if server_config_path:
-            self.server_config_path = server_config_path
+    setup_only: bool
+    server_config_path: str
 
 
 def parse_cli_args() -> IslandCmdArgs:

monkey/monkey_island/cc/environment/environment_singleton.py

@@ -2,7 +2,6 @@
 
 import monkey_island.cc.resources.auth.user_store as user_store
 from monkey_island.cc.environment import EnvironmentConfig, aws, password, standard
-from monkey_island.cc.server_utils.consts import DEFAULT_SERVER_CONFIG_PATH
 
 __author__ = "itay.mizeretz"
 
@@ -48,8 +47,3 @@ def initialize_from_file(file_path):
     except Exception:
         logger.error("Failed initializing environment", exc_info=True)
         raise
-
-
-# TODO: This is only needed so that unit tests pass. After PR #848 is merged, we may be
-# able to remove this line.
-initialize_from_file(DEFAULT_SERVER_CONFIG_PATH)

monkey/monkey_island/cc/main.py

@@ -35,9 +35,7 @@
 MINIMUM_MONGO_DB_VERSION_REQUIRED = "4.2.0"
 
 
-def main(setup_only: bool, server_config_path: str, config_options: IslandConfigOptions):
-
-    env_singleton.initialize_from_file(server_config_path)
+def main(setup_only: bool, config_options: IslandConfigOptions):
     initialize_encryptor(config_options.data_dir)
     initialize_services(config_options.data_dir)
 
@@ -122,7 +120,3 @@ def assert_mongo_db_version(mongo_url):
         sys.exit(-1)
     else:
         logger.info("Mongo DB version OK. Got {0}".format(str(server_version)))
-
-
-if __name__ == "__main__":
-    main()

monkey/monkey_island/cc/models/__init__.py

@@ -1,14 +1,5 @@
 from mongoengine import connect
 
-# Needed so that a server_config.json file exists at the default path,
-# otherwise, unit tests will error while importing `env_singleton` below.
-from monkey_island.cc.environment import data_dir_generator, server_config_handler  # noqa: E402
-
-from ..server_utils.consts import DEFAULT_DATA_DIR
-
-data_dir_generator.create_data_dir(DEFAULT_DATA_DIR, False)
-server_config_handler.create_default_server_config_file()
-
 import monkey_island.cc.environment.environment_singleton as env_singleton  # noqa: E402
 
 from .command_control_channel import CommandControlChannel  # noqa: F401, E402
@@ -21,6 +12,7 @@
 from .monkey_ttl import MonkeyTtl  # noqa: F401, E402
 from .pba_results import PbaResults  # noqa: F401, E402
 
+# TODO refactor into explicit call when implementing mongodb startup
 connect(
     db=env_singleton.env.mongo_db_name,
     host=env_singleton.env.mongo_db_host,

monkey/monkey_island/cc/server_utils/consts.py

@@ -30,4 +30,3 @@ def get_default_data_dir() -> str:
 
 DEFAULT_LOG_LEVEL = "INFO"
 DEFAULT_START_MONGO_DB = True
-DEFAULT_SHOULD_SETUP_ONLY = False

monkey/monkey_island/setup/config_setup.py

@@ -11,7 +11,7 @@ def setup_config_by_cmd_arg(server_config_path) -> Tuple[IslandConfigOptions, st
     server_config_path = os.path.expandvars(os.path.expanduser(server_config_path))
     config = server_config_handler.load_server_config_from_file(server_config_path)
 
-    create_data_dir(config["data_dir"], create_parent_dirs=True)
+    create_data_dir(config.data_dir, create_parent_dirs=True)
     return config, server_config_path
 
 

monkey/monkey_island/setup/gevent_setup.py

@@ -0,0 +1,6 @@
+from gevent import monkey as gevent_monkey
+
+# We need to monkeypatch before any other imports to
+# make standard libraries compatible with gevent.
+# http://www.gevent.org/api/gevent.monkey.html
+gevent_monkey.patch_all()

monkey/tests/unit_tests/monkey_island/cc/conftest.py

@@ -1,3 +1,11 @@
+import monkey_island.cc.environment.environment_singleton as env_singleton
+from monkey_island.cc.environment.testing import TestingEnvironment
+
+# Mock environment singleton because it contains mongodb parameters
+# needed for model tests. See monkey/monkey_island/cc/models/__init__.py
+env_config = {}
+env_singleton.env = TestingEnvironment(env_config)
+
 # Without these imports pytests can't use fixtures,
 # because they are not found
-from tests.unit_tests.monkey_island.cc.mongomock_fixtures import *  # noqa: F401,F403
+from tests.unit_tests.monkey_island.cc.mongomock_fixtures import *  # noqa: F401,F403,E402