Merge pull request #1081 from guardicore/isort-everything

Isort everything

.travis.yml

@@ -58,7 +58,7 @@ script:
 - flake8 ./monkey
 
 ## Check import order
-- python -m isort ./monkey --settings-file ./ci_scripts/isort.cfg
+- python -m isort ./monkey --check-only
 
 ## Check that all python is properly formatted. Fail otherwise.
 - python -m black --check .

CHANGELOG.md

@@ -17,3 +17,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Monkey agents are stored in the configurable data_dir when monkey is "run
   from the island". #997
 - Reformated all code using black. #1070
+- Sort all imports usind isort. #1081

envs/monkey_zoo/blackbox/analyzers/zerologon_analyzer.py

@@ -1,13 +1,13 @@
-from typing import List
 from pprint import pformat
+from typing import List
 
 import dpath.util
 
 from common.config_value_paths import (
-    USER_LIST_PATH,
-    PASSWORD_LIST_PATH,
-    NTLM_HASH_LIST_PATH,
     LM_HASH_LIST_PATH,
+    NTLM_HASH_LIST_PATH,
+    PASSWORD_LIST_PATH,
+    USER_LIST_PATH,
 )
 from envs.monkey_zoo.blackbox.analyzers.analyzer import Analyzer
 from envs.monkey_zoo.blackbox.analyzers.analyzer_log import AnalyzerLog

envs/monkey_zoo/blackbox/island_client/island_config_parser.py

@@ -3,8 +3,8 @@
 import dpath.util
 from typing_extensions import Type
 
-from envs.monkey_zoo.blackbox.island_client.monkey_island_client import MonkeyIslandClient
 from envs.monkey_zoo.blackbox.config_templates.config_template import ConfigTemplate
+from envs.monkey_zoo.blackbox.island_client.monkey_island_client import MonkeyIslandClient
 
 
 class IslandConfigParser:

envs/monkey_zoo/blackbox/test_blackbox.py

@@ -7,8 +7,6 @@
 
 from envs.monkey_zoo.blackbox.analyzers.communication_analyzer import CommunicationAnalyzer
 from envs.monkey_zoo.blackbox.analyzers.zerologon_analyzer import ZerologonAnalyzer
-from envs.monkey_zoo.blackbox.island_client.island_config_parser import IslandConfigParser
-from envs.monkey_zoo.blackbox.island_client.monkey_island_client import MonkeyIslandClient
 from envs.monkey_zoo.blackbox.config_templates.config_template import ConfigTemplate
 from envs.monkey_zoo.blackbox.config_templates.drupal import Drupal
 from envs.monkey_zoo.blackbox.config_templates.elastic import Elastic
@@ -25,6 +23,8 @@
 from envs.monkey_zoo.blackbox.config_templates.wmi_mimikatz import WmiMimikatz
 from envs.monkey_zoo.blackbox.config_templates.wmi_pth import WmiPth
 from envs.monkey_zoo.blackbox.config_templates.zerologon import Zerologon
+from envs.monkey_zoo.blackbox.island_client.island_config_parser import IslandConfigParser
+from envs.monkey_zoo.blackbox.island_client.monkey_island_client import MonkeyIslandClient
 from envs.monkey_zoo.blackbox.log_handlers.test_logs_handler import TestLogsHandler
 from envs.monkey_zoo.blackbox.tests.exploitation import ExploitationTest
 from envs.monkey_zoo.blackbox.tests.performance.map_generation import MapGenerationTest

envs/monkey_zoo/blackbox/utils/config_generation_script.py

@@ -18,12 +18,8 @@
 from envs.monkey_zoo.blackbox.config_templates.wmi_mimikatz import WmiMimikatz
 from envs.monkey_zoo.blackbox.config_templates.wmi_pth import WmiPth
 from envs.monkey_zoo.blackbox.config_templates.zerologon import Zerologon
-from envs.monkey_zoo.blackbox.island_client.island_config_parser import (
-    IslandConfigParser,
-)
-from envs.monkey_zoo.blackbox.island_client.monkey_island_client import (
-    MonkeyIslandClient,
-)
+from envs.monkey_zoo.blackbox.island_client.island_config_parser import IslandConfigParser
+from envs.monkey_zoo.blackbox.island_client.monkey_island_client import MonkeyIslandClient
 
 DST_DIR_NAME = "generated_configs"
 DST_DIR_PATH = pathlib.Path(pathlib.Path(__file__).parent.absolute(), DST_DIR_NAME)

monkey/common/cloud/aws/aws_instance.py

@@ -1,6 +1,7 @@
 import json
 import logging
 import re
+
 import requests
 
 from common.cloud.environment_names import Environment

monkey/common/cloud/aws/test_aws_instance.py

@@ -5,7 +5,6 @@
 from common.cloud.aws.aws_instance import AWS_LATEST_METADATA_URI_PREFIX, AwsInstance
 from common.cloud.environment_names import Environment
 
-
 INSTANCE_ID_RESPONSE = "i-1234567890abcdef0"
 
 AVAILABILITY_ZONE_RESPONSE = "us-west-2b"

monkey/common/cloud/azure/test_azure_instance.py

@@ -6,7 +6,6 @@
 from common.cloud.azure.azure_instance import AZURE_METADATA_SERVICE_URL, AzureInstance
 from common.cloud.environment_names import Environment
 
-
 GOOD_DATA = {
     "compute": {
         "azEnvironment": "AZUREPUBLICCLOUD",

monkey/infection_monkey/control.py

@@ -9,12 +9,12 @@
 
 import infection_monkey.monkeyfs as monkeyfs
 import infection_monkey.tunnel as tunnel
+from common.common_consts.api_url_consts import T1216_PBA_FILE_DOWNLOAD_PATH
 from common.common_consts.timeouts import (
     LONG_REQUEST_TIMEOUT,
     MEDIUM_REQUEST_TIMEOUT,
     SHORT_REQUEST_TIMEOUT,
 )
-from common.common_consts.api_url_consts import T1216_PBA_FILE_DOWNLOAD_PATH
 from infection_monkey.config import GUID, WormConfiguration
 from infection_monkey.network.info import check_internet_access, local_ips
 from infection_monkey.transport.http import HTTPConnectProxy

monkey/infection_monkey/exploit/hadoop.py

@@ -11,8 +11,8 @@
 
 import requests
 
-from infection_monkey.exploit.tools.helpers import build_monkey_commandline, get_monkey_depth
 from common.common_consts.timeouts import LONG_REQUEST_TIMEOUT
+from infection_monkey.exploit.tools.helpers import build_monkey_commandline, get_monkey_depth
 from infection_monkey.exploit.tools.http_tools import HTTPTools
 from infection_monkey.exploit.web_rce import WebRCE
 from infection_monkey.model import (

monkey/infection_monkey/exploit/tests/test_zerologon.py

@@ -3,7 +3,6 @@
 from infection_monkey.exploit.zerologon import ZerologonExploiter
 from infection_monkey.model.host import VictimHost
 
-
 DOMAIN_NAME = "domain-name"
 IP = "0.0.0.0"
 NETBIOS_NAME = "NetBIOS Name"

monkey/infection_monkey/exploit/tests/zerologon_utils/test_vuln_assessment.py

@@ -5,7 +5,6 @@
 from infection_monkey.exploit.zerologon_utils.vuln_assessment import get_dc_details
 from infection_monkey.model.host import VictimHost
 
-
 DOMAIN_NAME = "domain-name"
 IP = "0.0.0.0"
 

monkey/infection_monkey/exploit/zerologon.py

@@ -21,7 +21,6 @@
 from infection_monkey.exploit.zerologon_utils.wmiexec import Wmiexec
 from infection_monkey.utils.capture_output import StdoutCapture
 
-
 LOG = logging.getLogger(__name__)
 
 

monkey/infection_monkey/monkey.py

@@ -7,7 +7,6 @@
 from threading import Thread
 
 import infection_monkey.tunnel as tunnel
-from infection_monkey.network.tools import is_running_on_island
 from common.utils.attack_utils import ScanStatus, UsageEnum
 from common.utils.exceptions import ExploitingVulnerableMachineError, FailedExploitationError
 from common.version import get_version
@@ -18,7 +17,7 @@
 from infection_monkey.network.firewall import app as firewall
 from infection_monkey.network.HostFinger import HostFinger
 from infection_monkey.network.network_scanner import NetworkScanner
-from infection_monkey.network.tools import get_interface_to_target
+from infection_monkey.network.tools import get_interface_to_target, is_running_on_island
 from infection_monkey.post_breach.post_breach_handler import PostBreach
 from infection_monkey.system_info import SystemInfoCollector
 from infection_monkey.system_singleton import SystemSingleton

monkey/infection_monkey/telemetry/scoutsuite_telem.py

@@ -1,5 +1,6 @@
 from ScoutSuite.output.result_encoder import ScoutJsonEncoder
 from ScoutSuite.providers.base.provider import BaseProvider
+
 from common.common_consts.telem_categories import TelemCategoryEnum
 from infection_monkey.telemetry.base_telem import BaseTelem
 

monkey/infection_monkey/telemetry/tests/attack/test_attack_telem.py

@@ -5,7 +5,6 @@
 from common.utils.attack_utils import ScanStatus
 from infection_monkey.telemetry.attack.attack_telem import AttackTelem
 
-
 STATUS = ScanStatus.USED
 TECHNIQUE = "T9999"
 

monkey/infection_monkey/telemetry/tests/attack/test_t1005_telem.py

@@ -5,7 +5,6 @@
 from common.utils.attack_utils import ScanStatus
 from infection_monkey.telemetry.attack.t1005_telem import T1005Telem
 
-
 GATHERED_DATA_TYPE = "[Type of data collected]"
 INFO = "[Additional info]"
 STATUS = ScanStatus.USED

monkey/infection_monkey/telemetry/tests/attack/test_t1035_telem.py

@@ -5,7 +5,6 @@
 from common.utils.attack_utils import ScanStatus, UsageEnum
 from infection_monkey.telemetry.attack.t1035_telem import T1035Telem
 
-
 STATUS = ScanStatus.USED
 USAGE = UsageEnum.SMB
 

monkey/infection_monkey/telemetry/tests/attack/test_t1064_telem.py

@@ -5,7 +5,6 @@
 from common.utils.attack_utils import ScanStatus
 from infection_monkey.telemetry.attack.t1064_telem import T1064Telem
 
-
 STATUS = ScanStatus.USED
 USAGE_STR = "[Usage info]"
 

monkey/infection_monkey/telemetry/tests/attack/test_t1105_telem.py

@@ -5,7 +5,6 @@
 from common.utils.attack_utils import ScanStatus
 from infection_monkey.telemetry.attack.t1105_telem import T1105Telem
 
-
 DST_IP = "0.0.0.1"
 FILENAME = "virus.exe"
 SRC_IP = "0.0.0.0"

monkey/infection_monkey/telemetry/tests/attack/test_t1106_telem.py

@@ -5,7 +5,6 @@
 from common.utils.attack_utils import ScanStatus, UsageEnum
 from infection_monkey.telemetry.attack.t1106_telem import T1106Telem
 
-
 STATUS = ScanStatus.USED
 USAGE = UsageEnum.SMB
 

monkey/infection_monkey/telemetry/tests/attack/test_t1107_telem.py

@@ -5,7 +5,6 @@
 from common.utils.attack_utils import ScanStatus
 from infection_monkey.telemetry.attack.t1107_telem import T1107Telem
 
-
 PATH = "path/to/file.txt"
 STATUS = ScanStatus.USED
 

monkey/infection_monkey/telemetry/tests/attack/test_t1129_telem.py

@@ -5,7 +5,6 @@
 from common.utils.attack_utils import ScanStatus, UsageEnum
 from infection_monkey.telemetry.attack.t1129_telem import T1129Telem
 
-
 STATUS = ScanStatus.USED
 USAGE = UsageEnum.SMB
 

monkey/infection_monkey/telemetry/tests/attack/test_t1197_telem.py

@@ -6,7 +6,6 @@
 from infection_monkey.model import VictimHost
 from infection_monkey.telemetry.attack.t1197_telem import T1197Telem
 
-
 DOMAIN_NAME = "domain-name"
 IP = "127.0.0.1"
 MACHINE = VictimHost(IP, DOMAIN_NAME)

monkey/infection_monkey/telemetry/tests/attack/test_t1222_telem.py

@@ -6,7 +6,6 @@
 from infection_monkey.model import VictimHost
 from infection_monkey.telemetry.attack.t1222_telem import T1222Telem
 
-
 COMMAND = "echo hi"
 DOMAIN_NAME = "domain-name"
 IP = "127.0.0.1"

monkey/infection_monkey/telemetry/tests/attack/test_usage_telem.py

@@ -5,7 +5,6 @@
 from common.utils.attack_utils import ScanStatus, UsageEnum
 from infection_monkey.telemetry.attack.usage_telem import UsageTelem
 
-
 STATUS = ScanStatus.USED
 TECHNIQUE = "T9999"
 USAGE = UsageEnum.SMB

monkey/infection_monkey/telemetry/tests/attack/test_victim_host_telem.py

@@ -6,7 +6,6 @@
 from infection_monkey.model import VictimHost
 from infection_monkey.telemetry.attack.victim_host_telem import VictimHostTelem
 
-
 DOMAIN_NAME = "domain-name"
 IP = "127.0.0.1"
 MACHINE = VictimHost(IP, DOMAIN_NAME)

monkey/infection_monkey/telemetry/tests/test_exploit_telem.py

@@ -6,7 +6,6 @@
 from infection_monkey.model.host import VictimHost
 from infection_monkey.telemetry.exploit_telem import ExploitTelem
 
-
 DOMAIN_NAME = "domain-name"
 IP = "0.0.0.0"
 HOST = VictimHost(IP, DOMAIN_NAME)

monkey/infection_monkey/telemetry/tests/test_post_breach_telem.py

@@ -4,7 +4,6 @@
 
 from infection_monkey.telemetry.post_breach_telem import PostBreachTelem
 
-
 HOSTNAME = "hostname"
 IP = "0.0.0.0"
 PBA_COMMAND = "run some pba"

monkey/infection_monkey/telemetry/tests/test_scan_telem.py

@@ -2,9 +2,8 @@
 
 import pytest
 
-from infection_monkey.telemetry.scan_telem import ScanTelem
 from infection_monkey.model.host import VictimHost
-
+from infection_monkey.telemetry.scan_telem import ScanTelem
 
 DOMAIN_NAME = "domain-name"
 IP = "0.0.0.0"

monkey/infection_monkey/telemetry/tests/test_state_telem.py

@@ -4,7 +4,6 @@
 
 from infection_monkey.telemetry.state_telem import StateTelem
 
-
 IS_DONE = True
 VERSION = "version"
 

monkey/infection_monkey/telemetry/tests/test_system_info_telem.py

@@ -4,7 +4,6 @@
 
 from infection_monkey.telemetry.system_info_telem import SystemInfoTelem
 
-
 SYSTEM_INFO = {}
 
 

monkey/infection_monkey/telemetry/tests/test_trace_telem.py

@@ -4,7 +4,6 @@
 
 from infection_monkey.telemetry.trace_telem import TraceTelem
 
-
 MSG = "message"
 
 

monkey/monkey_island.py

@@ -8,7 +8,6 @@
 
 from monkey_island.cc.server_utils.island_logger import json_setup_logging  # noqa: E402
 
-
 if "__main__" == __name__:
     island_args = parse_cli_args()
 

monkey/monkey_island/cc/app.py

@@ -7,10 +7,6 @@
 
 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.resources.test.telemetry_test import TelemetryTest
-from monkey_island.cc.resources.zero_trust.zero_trust_report import ZeroTrustReport
-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
@@ -35,18 +31,22 @@
 from monkey_island.cc.resources.pba_file_download import PBAFileDownload
 from monkey_island.cc.resources.pba_file_upload import FileUpload
 from monkey_island.cc.resources.remote_run import RemoteRun
-from monkey_island.cc.resources.security_report import SecurityReport
 from monkey_island.cc.resources.root import Root
+from monkey_island.cc.resources.security_report import SecurityReport
 from monkey_island.cc.resources.T1216_pba_file_download import T1216PBAFileDownload
 from monkey_island.cc.resources.telemetry import Telemetry
 from monkey_island.cc.resources.telemetry_feed import TelemetryFeed
 from monkey_island.cc.resources.test.clear_caches import ClearCaches
 from monkey_island.cc.resources.test.log_test import LogTest
 from monkey_island.cc.resources.test.monkey_test import MonkeyTest
+from monkey_island.cc.resources.test.telemetry_test import TelemetryTest
 from monkey_island.cc.resources.version_update import VersionUpdate
 from monkey_island.cc.resources.zero_trust.finding_event import ZeroTrustFindingEvent
 from monkey_island.cc.resources.zero_trust.scoutsuite_auth.aws_keys import AWSKeys
 from monkey_island.cc.resources.zero_trust.scoutsuite_auth.scoutsuite_auth import ScoutSuiteAuth
+from monkey_island.cc.resources.zero_trust.zero_trust_report import ZeroTrustReport
+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.services.database import Database
 from monkey_island.cc.services.remote_run_aws import RemoteRunAwsService
 from monkey_island.cc.services.representations import output_json

monkey/monkey_island/cc/arg_parser.py

@@ -1,8 +1,8 @@
 from dataclasses import dataclass
 
 from monkey_island.cc.server_utils.consts import (
-    DEFAULT_SERVER_CONFIG_PATH,
     DEFAULT_LOGGER_CONFIG_PATH,
+    DEFAULT_SERVER_CONFIG_PATH,
 )
 
 

monkey/monkey_island/cc/environment/environment_config.py

@@ -6,10 +6,10 @@
 from typing import Dict, List
 
 import monkey_island.cc.environment.server_config_generator as server_config_generator
-from monkey_island.cc.server_utils.consts import DEFAULT_DATA_DIR
 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
+from monkey_island.cc.server_utils.consts import DEFAULT_DATA_DIR
 
 
 class EnvironmentConfig: