Grouped files used for serving flask into a "server_utils" package

monkey/monkey_island/cc/app.py

@@ -7,8 +7,8 @@ from werkzeug.exceptions import NotFound
 
 import monkey_island.cc.environment.environment_singleton as env_singleton
 from common.common_consts.api_url_consts import T1216_PBA_FILE_DOWNLOAD_PATH
-from monkey_island.cc.consts import MONKEY_ISLAND_ABS_PATH
-from monkey_island.cc.custom_json_encoder import CustomJSONEncoder
+from monkey_island.cc.server_utils.consts import MONKEY_ISLAND_ABS_PATH
+from monkey_island.cc.server_utils.custom_json_encoder import CustomJSONEncoder
 from monkey_island.cc.database import database, mongo
 from monkey_island.cc.resources.attack.attack_config import AttackConfiguration
 from monkey_island.cc.resources.attack.attack_report import AttackReport

monkey/monkey_island/cc/environment/environment_config.py

@@ -6,7 +6,7 @@ from pathlib import Path
 from typing import Dict, List
 
 import monkey_island.cc.environment.server_config_generator as server_config_generator
-from monkey_island.cc.consts import MONKEY_ISLAND_ABS_PATH
+from monkey_island.cc.server_utils.consts import MONKEY_ISLAND_ABS_PATH
 from monkey_island.cc.environment.user_creds import UserCreds
 from monkey_island.cc.resources.auth.auth_user import User
 from monkey_island.cc.resources.auth.user_store import UserStore

monkey/monkey_island/cc/environment/test_environment_config.py

@@ -6,7 +6,7 @@ from unittest import TestCase
 from unittest.mock import MagicMock, patch
 
 import monkey_island.cc.testing.environment.server_config_mocks as config_mocks
-from monkey_island.cc.consts import MONKEY_ISLAND_ABS_PATH
+from monkey_island.cc.server_utils.consts import MONKEY_ISLAND_ABS_PATH
 from monkey_island.cc.environment.environment_config import EnvironmentConfig
 from monkey_island.cc.environment.user_creds import UserCreds
 

monkey/monkey_island/cc/main.py

@@ -10,8 +10,8 @@ MONKEY_ISLAND_DIR_BASE_PATH = str(Path(__file__).parent.parent)
 if str(MONKEY_ISLAND_DIR_BASE_PATH) not in sys.path:
     sys.path.insert(0, MONKEY_ISLAND_DIR_BASE_PATH)
 
-from monkey_island.cc.consts import MONKEY_ISLAND_ABS_PATH  # noqa: E402
-from monkey_island.cc.island_logger import json_setup_logging  # noqa: E402
+from monkey_island.cc.server_utils.consts import MONKEY_ISLAND_ABS_PATH  # noqa: E402
+from monkey_island.cc.server_utils.island_logger import json_setup_logging  # noqa: E402
 
 # This is here in order to catch EVERYTHING, some functions are being called on imports the log init needs to be on top.
 json_setup_logging(default_path=Path(MONKEY_ISLAND_ABS_PATH, 'cc', 'island_logger_default_config.json'),
@@ -21,10 +21,10 @@ logger = logging.getLogger(__name__)
 import monkey_island.cc.environment.environment_singleton as env_singleton  # noqa: E402
 from common.version import get_version  # noqa: E402
 from monkey_island.cc.app import init_app  # noqa: E402
-from monkey_island.cc.bootloader_server import BootloaderHttpServer  # noqa: E402
+from monkey_island.cc.server_utils.bootloader_server import BootloaderHttpServer  # noqa: E402
 from monkey_island.cc.database import get_db_version  # noqa: E402
 from monkey_island.cc.database import is_db_server_up  # noqa: E402
-from monkey_island.cc.network_utils import local_ip_addresses  # noqa: E402
+from monkey_island.cc.services.utils.network_utils import local_ip_addresses  # noqa: E402
 from monkey_island.cc.resources.monkey_download import MonkeyDownload  # noqa: E402
 from monkey_island.cc.services.reporting.exporter_init import populate_exporter_list  # noqa: E402
 from monkey_island.cc.setup import setup  # noqa: E402

monkey/monkey_island/cc/models/monkey.py

@@ -6,10 +6,10 @@ from mongoengine import (BooleanField, DateTimeField, Document, DoesNotExist, Dy
                          ListField, ReferenceField, StringField)
 
 from common.cloud import environment_names
-from monkey_island.cc.consts import DEFAULT_MONKEY_TTL_EXPIRY_DURATION_IN_SECONDS
+from monkey_island.cc.server_utils.consts import DEFAULT_MONKEY_TTL_EXPIRY_DURATION_IN_SECONDS
 from monkey_island.cc.models.command_control_channel import CommandControlChannel
 from monkey_island.cc.models.monkey_ttl import MonkeyTtl, create_monkey_ttl_document
-from monkey_island.cc.network_utils import local_ip_addresses
+from monkey_island.cc.services.utils.network_utils import local_ip_addresses
 
 MAX_MONKEYS_AMOUNT_TO_CACHE = 100
 

monkey/monkey_island/cc/resources/T1216_pba_file_download.py

@@ -3,7 +3,7 @@ import os
 import flask_restful
 from flask import send_from_directory
 
-from monkey_island.cc.consts import MONKEY_ISLAND_ABS_PATH
+from monkey_island.cc.server_utils.consts import MONKEY_ISLAND_ABS_PATH
 
 
 class T1216PBAFileDownload(flask_restful.Resource):

monkey/monkey_island/cc/resources/local_run.py

@@ -8,9 +8,9 @@ import flask_restful
 from flask import jsonify, make_response, request
 
 import monkey_island.cc.environment.environment_singleton as env_singleton
-from monkey_island.cc.consts import MONKEY_ISLAND_ABS_PATH
+from monkey_island.cc.server_utils.consts import MONKEY_ISLAND_ABS_PATH
 from monkey_island.cc.models import Monkey
-from monkey_island.cc.network_utils import local_ip_addresses
+from monkey_island.cc.services.utils.network_utils import local_ip_addresses
 from monkey_island.cc.resources.monkey_download import get_monkey_executable
 from monkey_island.cc.services.node import NodeService
 

monkey/monkey_island/cc/resources/monkey.py

@@ -5,7 +5,7 @@ import dateutil.parser
 import flask_restful
 from flask import request
 
-from monkey_island.cc.consts import DEFAULT_MONKEY_TTL_EXPIRY_DURATION_IN_SECONDS
+from monkey_island.cc.server_utils.consts import DEFAULT_MONKEY_TTL_EXPIRY_DURATION_IN_SECONDS
 from monkey_island.cc.database import mongo
 from monkey_island.cc.models.monkey_ttl import create_monkey_ttl_document
 from monkey_island.cc.resources.test.utils.telem_store import TestTelemStore

monkey/monkey_island/cc/resources/monkey_download.py

@@ -6,7 +6,7 @@ import os
 import flask_restful
 from flask import request, send_from_directory
 
-from monkey_island.cc.consts import MONKEY_ISLAND_ABS_PATH
+from monkey_island.cc.server_utils.consts import MONKEY_ISLAND_ABS_PATH
 
 __author__ = 'Barak'
 

monkey/monkey_island/cc/resources/root.py

@@ -5,7 +5,7 @@ import flask_restful
 from flask import jsonify, make_response, request
 
 from monkey_island.cc.database import mongo
-from monkey_island.cc.network_utils import local_ip_addresses
+from monkey_island.cc.services.utils.network_utils import local_ip_addresses
 from monkey_island.cc.resources.auth.auth import jwt_required
 from monkey_island.cc.services.database import Database
 from monkey_island.cc.services.infection_lifecycle import InfectionLifecycle

monkey/monkey_island/cc/server_utils/custom_json_encoder.py

@@ -1,4 +1,4 @@
-from bson import ObjectId
+from bson import ObjectId, json_util
 from flask.json import JSONEncoder
 
 
@@ -7,7 +7,7 @@ class CustomJSONEncoder(JSONEncoder):
     def default(self, obj):
         try:
             if isinstance(obj, ObjectId):
-                return obj.__str__()
+                return json_util.dumps(obj)
         except TypeError:
             pass
         return JSONEncoder.default(self, obj)

monkey/monkey_island/cc/server_utils/encryptor.py

@@ -5,7 +5,7 @@ import os
 from Crypto import Random  # noqa: DOU133
 from Crypto.Cipher import AES  # noqa: DOU133
 
-from monkey_island.cc.consts import MONKEY_ISLAND_ABS_PATH
+from monkey_island.cc.server_utils.consts import MONKEY_ISLAND_ABS_PATH
 
 __author__ = "itay.mizeretz"
 

monkey/monkey_island/cc/services/attack/technique_reports/technique_report_tools.py

@@ -1,4 +1,4 @@
-from monkey_island.cc.encryptor import encryptor
+from monkey_island.cc.server_utils.encryptor import encryptor
 
 
 def parse_creds(attempt):

monkey/monkey_island/cc/services/config.py

@@ -8,8 +8,8 @@ from jsonschema import Draft4Validator, validators
 import monkey_island.cc.environment.environment_singleton as env_singleton
 import monkey_island.cc.services.post_breach_files
 from monkey_island.cc.database import mongo
-from monkey_island.cc.encryptor import encryptor
-from monkey_island.cc.network_utils import local_ip_addresses
+from monkey_island.cc.server_utils.encryptor import encryptor
+from monkey_island.cc.services.utils.network_utils import local_ip_addresses
 from monkey_island.cc.services.config_schema.config_schema import SCHEMA
 
 __author__ = "itay.mizeretz"

monkey/monkey_island/cc/services/node.py

@@ -8,7 +8,7 @@ import monkey_island.cc.services.log
 from monkey_island.cc import models
 from monkey_island.cc.database import mongo
 from monkey_island.cc.models import Monkey
-from monkey_island.cc.network_utils import is_local_ips, local_ip_addresses
+from monkey_island.cc.services.utils.network_utils import is_local_ips, local_ip_addresses
 from monkey_island.cc.services.edge.displayed_edge import DisplayedEdgeService
 from monkey_island.cc.services.edge.edge import EdgeService
 from monkey_island.cc.services.utils.node_states import NodeStates

monkey/monkey_island/cc/services/reporting/report.py

@@ -10,7 +10,7 @@ from common.network.network_range import NetworkRange
 from common.network.segmentation_utils import get_ip_in_src_and_not_in_dst
 from monkey_island.cc.database import mongo
 from monkey_island.cc.models import Monkey
-from monkey_island.cc.network_utils import get_subnets, local_ip_addresses
+from monkey_island.cc.services.utils.network_utils import get_subnets, local_ip_addresses
 from monkey_island.cc.services.config import ConfigService
 from monkey_island.cc.services.config_schema.config_value_paths import (EXPLOITER_CLASSES_PATH, LOCAL_NETWORK_SCAN_PATH,
                                                                         PASSWORD_LIST_PATH, SUBNET_SCAN_LIST_PATH,

monkey/monkey_island/cc/services/telemetry/processing/exploit.py

@@ -2,7 +2,7 @@ import copy
 
 import dateutil
 
-from monkey_island.cc.encryptor import encryptor
+from monkey_island.cc.server_utils.encryptor import encryptor
 from monkey_island.cc.models import Monkey
 from monkey_island.cc.services.edge.displayed_edge import EdgeService
 from monkey_island.cc.services.node import NodeService

monkey/monkey_island/cc/services/telemetry/processing/system_info.py

@@ -1,6 +1,6 @@
 import logging
 
-from monkey_island.cc.encryptor import encryptor
+from monkey_island.cc.server_utils.encryptor import encryptor
 from monkey_island.cc.services.config import ConfigService
 from monkey_island.cc.services.node import NodeService
 from monkey_island.cc.services.telemetry.processing.system_info_collectors.system_info_telemetry_dispatcher import \

monkey/monkey_island/cc/services/zero_trust/scoutsuite/scoutsuite_auth_service.py

@@ -5,7 +5,7 @@ from typing import Tuple
 
 from common.cloud.scoutsuite_consts import CloudProviders
 from common.utils.exceptions import InvalidAWSKeys
-from monkey_island.cc.encryptor import encryptor
+from monkey_island.cc.server_utils.encryptor import encryptor
 from monkey_island.cc.services.config import ConfigService
 from monkey_island.cc.services.config_schema.config_value_paths import AWS_KEYS_PATH