Change to isort from flake8-import-order

fix issues in envs/ as well

.travis.yml

@@ -20,7 +20,7 @@ install:
 # Python
 - pip freeze
 - pip install -r monkey/monkey_island/requirements.txt  # for unit tests
-- pip install flake8 pytest dlint flake8-import-order # for next stages
+- pip install flake8 pytest dlint isort # for next stages
 - pip install coverage  # for code coverage
 - pip install -r monkey/infection_monkey/requirements.txt  # for unit tests
 - pip install pipdeptree
@@ -69,6 +69,9 @@ script:
 - PYTHON_WARNINGS_AMOUNT_UPPER_LIMIT=120
 - if [ $(tail -n 1 flake8_warnings.txt) -gt $PYTHON_WARNINGS_AMOUNT_UPPER_LIMIT ]; then echo "Too many python linter warnings! Failing this build. Lower the amount of linter errors in this and try again. " && exit 1; fi
 
+## Check import order
+- python -m isort . -c -p common -p infection_monkey -p monkey_island
+
 ## Run unit tests
 - cd monkey  # This is our source dir
 - python -m pytest  # Have to use `python -m pytest` instead of `pytest` to add "{$builddir}/monkey/monkey" to sys.path.

envs/monkey_zoo/blackbox/analyzers/performance_analyzer.py

@@ -3,7 +3,8 @@ from datetime import timedelta
 from typing import Dict
 
 from envs.monkey_zoo.blackbox.analyzers.analyzer import Analyzer
-from envs.monkey_zoo.blackbox.tests.performance.performance_test_config import PerformanceTestConfig
+from envs.monkey_zoo.blackbox.tests.performance.performance_test_config import \
+    PerformanceTestConfig
 
 LOGGER = logging.getLogger(__name__)
 

envs/monkey_zoo/blackbox/island_client/monkey_island_client.py

@@ -1,11 +1,11 @@
 import json
-
 import logging
 from time import sleep
 
 from bson import json_util
 
-from envs.monkey_zoo.blackbox.island_client.monkey_island_requests import MonkeyIslandRequests
+from envs.monkey_zoo.blackbox.island_client.monkey_island_requests import \
+    MonkeyIslandRequests
 
 SLEEP_BETWEEN_REQUESTS_SECONDS = 0.5
 MONKEY_TEST_ENDPOINT = 'api/test/monkey'

envs/monkey_zoo/blackbox/island_client/monkey_island_requests.py

@@ -1,13 +1,12 @@
-from typing import Dict
+import functools
+import logging
 from datetime import timedelta
-
+from typing import Dict
 
 import requests
-import functools
 
-from envs.monkey_zoo.blackbox.island_client.supported_request_method import SupportedRequestMethod
-
-import logging
+from envs.monkey_zoo.blackbox.island_client.supported_request_method import \
+    SupportedRequestMethod
 
 # SHA3-512 of '1234567890!@#$%^&*()_nothing_up_my_sleeve_1234567890!@#$%^&*()'
 NO_AUTH_CREDS = '55e97c9dcfd22b8079189ddaeea9bce8125887e3237b800c6176c9afa80d2062' \

envs/monkey_zoo/blackbox/log_handlers/test_logs_handler.py

@@ -2,8 +2,10 @@ import logging
 import os
 import shutil
 
-from envs.monkey_zoo.blackbox.log_handlers.monkey_log_parser import MonkeyLogParser
-from envs.monkey_zoo.blackbox.log_handlers.monkey_logs_downloader import MonkeyLogsDownloader
+from envs.monkey_zoo.blackbox.log_handlers.monkey_log_parser import \
+    MonkeyLogParser
+from envs.monkey_zoo.blackbox.log_handlers.monkey_logs_downloader import \
+    MonkeyLogsDownloader
 
 LOG_DIR_NAME = 'logs'
 LOGGER = logging.getLogger(__name__)

envs/monkey_zoo/blackbox/test_blackbox.py

@@ -1,20 +1,28 @@
-import os
 import logging
-
-import pytest
+import os
 from time import sleep
 
-from envs.monkey_zoo.blackbox.analyzers.communication_analyzer import CommunicationAnalyzer
-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
+import pytest
+
+from envs.monkey_zoo.blackbox.analyzers.communication_analyzer import \
+    CommunicationAnalyzer
+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
-from envs.monkey_zoo.blackbox.tests.performance.map_generation_from_telemetries import MapGenerationFromTelemetryTest
-from envs.monkey_zoo.blackbox.tests.performance.report_generation import ReportGenerationTest
+from envs.monkey_zoo.blackbox.tests.performance.map_generation import \
+    MapGenerationTest
+from envs.monkey_zoo.blackbox.tests.performance.map_generation_from_telemetries import \
+    MapGenerationFromTelemetryTest
+from envs.monkey_zoo.blackbox.tests.performance.report_generation import \
+    ReportGenerationTest
 from envs.monkey_zoo.blackbox.tests.performance.report_generation_from_telemetries import \
     ReportGenerationFromTelemetryTest
-from envs.monkey_zoo.blackbox.tests.performance.telemetry_performance_test import TelemetryPerformanceTest
+from envs.monkey_zoo.blackbox.tests.performance.telemetry_performance_test import \
+    TelemetryPerformanceTest
 from envs.monkey_zoo.blackbox.utils import gcp_machine_handlers
 
 DEFAULT_TIMEOUT_SECONDS = 5*60

envs/monkey_zoo/blackbox/tests/performance/endpoint_performance_test.py

@@ -1,10 +1,14 @@
 import logging
 
-from envs.monkey_zoo.blackbox.analyzers.performance_analyzer import PerformanceAnalyzer
-from envs.monkey_zoo.blackbox.island_client.monkey_island_client import MonkeyIslandClient
-from envs.monkey_zoo.blackbox.island_client.supported_request_method import SupportedRequestMethod
+from envs.monkey_zoo.blackbox.analyzers.performance_analyzer import \
+    PerformanceAnalyzer
+from envs.monkey_zoo.blackbox.island_client.monkey_island_client import \
+    MonkeyIslandClient
+from envs.monkey_zoo.blackbox.island_client.supported_request_method import \
+    SupportedRequestMethod
 from envs.monkey_zoo.blackbox.tests.basic_test import BasicTest
-from envs.monkey_zoo.blackbox.tests.performance.performance_test_config import PerformanceTestConfig
+from envs.monkey_zoo.blackbox.tests.performance.performance_test_config import \
+    PerformanceTestConfig
 
 LOGGER = logging.getLogger(__name__)
 

envs/monkey_zoo/blackbox/tests/performance/map_generation.py

@@ -1,9 +1,12 @@
 from datetime import timedelta
 
 from envs.monkey_zoo.blackbox.tests.exploitation import ExploitationTest
-from envs.monkey_zoo.blackbox.tests.performance.performance_test import PerformanceTest
-from envs.monkey_zoo.blackbox.tests.performance.performance_test_config import PerformanceTestConfig
-from envs.monkey_zoo.blackbox.tests.performance.performance_test_workflow import PerformanceTestWorkflow
+from envs.monkey_zoo.blackbox.tests.performance.performance_test import \
+    PerformanceTest
+from envs.monkey_zoo.blackbox.tests.performance.performance_test_config import \
+    PerformanceTestConfig
+from envs.monkey_zoo.blackbox.tests.performance.performance_test_workflow import \
+    PerformanceTestWorkflow
 
 MAX_ALLOWED_SINGLE_PAGE_TIME = timedelta(seconds=2)
 MAX_ALLOWED_TOTAL_TIME = timedelta(seconds=5)

envs/monkey_zoo/blackbox/tests/performance/map_generation_from_telemetries.py

@@ -1,7 +1,9 @@
 from datetime import timedelta
 
-from envs.monkey_zoo.blackbox.tests.performance.performance_test import PerformanceTest
-from envs.monkey_zoo.blackbox.tests.performance.performance_test_config import PerformanceTestConfig
+from envs.monkey_zoo.blackbox.tests.performance.performance_test import \
+    PerformanceTest
+from envs.monkey_zoo.blackbox.tests.performance.performance_test_config import \
+    PerformanceTestConfig
 from envs.monkey_zoo.blackbox.tests.performance.telemetry_performance_test_workflow import \
     TelemetryPerformanceTestWorkflow
 

envs/monkey_zoo/blackbox/tests/performance/performance_test_workflow.py

@@ -1,7 +1,9 @@
 from envs.monkey_zoo.blackbox.tests.basic_test import BasicTest
 from envs.monkey_zoo.blackbox.tests.exploitation import ExploitationTest
-from envs.monkey_zoo.blackbox.tests.performance.endpoint_performance_test import EndpointPerformanceTest
-from envs.monkey_zoo.blackbox.tests.performance.performance_test_config import PerformanceTestConfig
+from envs.monkey_zoo.blackbox.tests.performance.endpoint_performance_test import \
+    EndpointPerformanceTest
+from envs.monkey_zoo.blackbox.tests.performance.performance_test_config import \
+    PerformanceTestConfig
 
 
 class PerformanceTestWorkflow(BasicTest):

envs/monkey_zoo/blackbox/tests/performance/report_generation.py

@@ -1,9 +1,12 @@
 from datetime import timedelta
 
 from envs.monkey_zoo.blackbox.tests.exploitation import ExploitationTest
-from envs.monkey_zoo.blackbox.tests.performance.performance_test import PerformanceTest
-from envs.monkey_zoo.blackbox.tests.performance.performance_test_config import PerformanceTestConfig
-from envs.monkey_zoo.blackbox.tests.performance.performance_test_workflow import PerformanceTestWorkflow
+from envs.monkey_zoo.blackbox.tests.performance.performance_test import \
+    PerformanceTest
+from envs.monkey_zoo.blackbox.tests.performance.performance_test_config import \
+    PerformanceTestConfig
+from envs.monkey_zoo.blackbox.tests.performance.performance_test_workflow import \
+    PerformanceTestWorkflow
 
 MAX_ALLOWED_SINGLE_PAGE_TIME = timedelta(seconds=2)
 MAX_ALLOWED_TOTAL_TIME = timedelta(seconds=5)

envs/monkey_zoo/blackbox/tests/performance/report_generation_from_telemetries.py

@@ -1,7 +1,9 @@
 from datetime import timedelta
 
-from envs.monkey_zoo.blackbox.tests.performance.performance_test import PerformanceTest
-from envs.monkey_zoo.blackbox.tests.performance.performance_test_config import PerformanceTestConfig
+from envs.monkey_zoo.blackbox.tests.performance.performance_test import \
+    PerformanceTest
+from envs.monkey_zoo.blackbox.tests.performance.performance_test_config import \
+    PerformanceTestConfig
 from envs.monkey_zoo.blackbox.tests.performance.telemetry_performance_test_workflow import \
     TelemetryPerformanceTestWorkflow
 

envs/monkey_zoo/blackbox/tests/performance/telem_sample_parsing/sample_file_parser.py

@@ -1,7 +1,7 @@
 import json
 import logging
 from os import listdir, path
-from typing import List, Dict
+from typing import Dict, List
 
 from tqdm import tqdm
 

envs/monkey_zoo/blackbox/tests/performance/telem_sample_parsing/sample_multiplier/fake_monkey.py

@@ -1,7 +1,7 @@
 import random
 
-from envs.monkey_zoo.blackbox.tests.performance.\
-    telem_sample_parsing.sample_multiplier.fake_ip_generator import FakeIpGenerator
+from envs.monkey_zoo.blackbox.tests.performance.telem_sample_parsing.sample_multiplier.fake_ip_generator import \
+    FakeIpGenerator
 
 
 class FakeMonkey:

envs/monkey_zoo/blackbox/tests/performance/telem_sample_parsing/sample_multiplier/sample_multiplier.py

@@ -2,14 +2,16 @@ import copy
 import json
 import logging
 import sys
-from typing import List, Dict
+from typing import Dict, List
 
 from tqdm import tqdm
 
-from envs.monkey_zoo.blackbox.tests.performance.telem_sample_parsing.sample_file_parser import SampleFileParser
-from envs.monkey_zoo.blackbox.tests.performance.\
-    telem_sample_parsing.sample_multiplier.fake_ip_generator import FakeIpGenerator
-from envs.monkey_zoo.blackbox.tests.performance.telem_sample_parsing.sample_multiplier.fake_monkey import FakeMonkey
+from envs.monkey_zoo.blackbox.tests.performance.telem_sample_parsing.sample_file_parser import \
+    SampleFileParser
+from envs.monkey_zoo.blackbox.tests.performance.telem_sample_parsing.sample_multiplier.fake_ip_generator import \
+    FakeIpGenerator
+from envs.monkey_zoo.blackbox.tests.performance.telem_sample_parsing.sample_multiplier.fake_monkey import \
+    FakeMonkey
 
 TELEM_DIR_PATH = './tests/performance/telemetry_sample'
 LOGGER = logging.getLogger(__name__)

envs/monkey_zoo/blackbox/tests/performance/telem_sample_parsing/sample_multiplier/test_fake_ip_generator.py

@@ -1,7 +1,7 @@
 from unittest import TestCase
 
-from envs.monkey_zoo.blackbox.tests.performance.\
-    telem_sample_parsing.sample_multiplier.fake_ip_generator import FakeIpGenerator
+from envs.monkey_zoo.blackbox.tests.performance.telem_sample_parsing.sample_multiplier.fake_ip_generator import \
+    FakeIpGenerator
 
 
 class TestFakeIpGenerator(TestCase):

envs/monkey_zoo/blackbox/tests/performance/telemetry_performance_test.py

@@ -4,11 +4,16 @@ from datetime import timedelta
 
 from tqdm import tqdm
 
-from envs.monkey_zoo.blackbox.analyzers.performance_analyzer import PerformanceAnalyzer
-from envs.monkey_zoo.blackbox.island_client.monkey_island_client import MonkeyIslandClient
-from envs.monkey_zoo.blackbox.island_client.supported_request_method import SupportedRequestMethod
-from envs.monkey_zoo.blackbox.tests.performance.performance_test_config import PerformanceTestConfig
-from envs.monkey_zoo.blackbox.tests.performance.telem_sample_parsing.sample_file_parser import SampleFileParser
+from envs.monkey_zoo.blackbox.analyzers.performance_analyzer import \
+    PerformanceAnalyzer
+from envs.monkey_zoo.blackbox.island_client.monkey_island_client import \
+    MonkeyIslandClient
+from envs.monkey_zoo.blackbox.island_client.supported_request_method import \
+    SupportedRequestMethod
+from envs.monkey_zoo.blackbox.tests.performance.performance_test_config import \
+    PerformanceTestConfig
+from envs.monkey_zoo.blackbox.tests.performance.telem_sample_parsing.sample_file_parser import \
+    SampleFileParser
 
 LOGGER = logging.getLogger(__name__)
 

envs/monkey_zoo/blackbox/tests/performance/telemetry_performance_test_workflow.py

@@ -1,7 +1,10 @@
 from envs.monkey_zoo.blackbox.tests.basic_test import BasicTest
-from envs.monkey_zoo.blackbox.tests.performance.endpoint_performance_test import EndpointPerformanceTest
-from envs.monkey_zoo.blackbox.tests.performance.performance_test_config import PerformanceTestConfig
-from envs.monkey_zoo.blackbox.tests.performance.telemetry_performance_test import TelemetryPerformanceTest
+from envs.monkey_zoo.blackbox.tests.performance.endpoint_performance_test import \
+    EndpointPerformanceTest
+from envs.monkey_zoo.blackbox.tests.performance.performance_test_config import \
+    PerformanceTestConfig
+from envs.monkey_zoo.blackbox.tests.performance.telemetry_performance_test import \
+    TelemetryPerformanceTest
 
 
 class TelemetryPerformanceTestWorkflow(BasicTest):

envs/os_compatibility/test_compatibility.py

@@ -1,7 +1,7 @@
 import pytest
 
-from envs.monkey_zoo.blackbox.island_client.monkey_island_client import MonkeyIslandClient
-
+from envs.monkey_zoo.blackbox.island_client.monkey_island_client import \
+    MonkeyIslandClient
 
 machine_list = {
     "10.0.0.36": "centos_6",

monkey/infection_monkey/exploit/mssqlexec.py

@@ -4,7 +4,6 @@ import sys
 from time import sleep
 
 import pymssql
-
 from common.utils.exceptions import (ExploitingVulnerableMachineError,
                                      FailedExploitationError)
 from common.utils.exploit_enum import ExploitType

monkey/infection_monkey/network/info.py

@@ -5,11 +5,11 @@ import struct
 from random import randint
 from subprocess import check_output
 
-import netifaces
 import psutil
 import requests
 from requests import ConnectionError
 
+import netifaces
 from common.network.network_range import CidrRange
 from infection_monkey.utils.environment import is_windows_os
 

monkey/monkey_island/cc/models/__init__.py

@@ -2,6 +2,14 @@ from mongoengine import connect
 
 import monkey_island.cc.environment.environment_singleton as env_singleton
 
+from .command_control_channel import CommandControlChannel  # noqa: F401
+# Order of importing matters here, for registering the embedded and referenced documents before using them.
+from .config import Config  # noqa: F401
+from .creds import Creds  # noqa: F401
+from .monkey import Monkey  # noqa: F401
+from .monkey_ttl import MonkeyTtl  # noqa: F401
+from .pba_results import PbaResults  # noqa: F401
+
 # This section sets up the DB connection according to the environment.
 #   If testing, use mongomock which only emulates mongo. for more information, see
 #   http://docs.mongoengine.org/guide/mongomock.html .
@@ -10,11 +18,3 @@ if env_singleton.env.testing:  # See monkey_island.cc.environment.testing
     connect('mongoenginetest', host='mongomock://localhost')
 else:
     connect(db=env_singleton.env.mongo_db_name, host=env_singleton.env.mongo_db_host, port=env_singleton.env.mongo_db_port)
-
-from .command_control_channel import CommandControlChannel  # noqa: F401
-# Order of importing matters here, for registering the embedded and referenced documents before using them.
-from .config import Config  # noqa: F401
-from .creds import Creds  # noqa: F401
-from .monkey import Monkey  # noqa: F401
-from .monkey_ttl import MonkeyTtl  # noqa: F401
-from .pba_results import PbaResults  # noqa: F401

monkey/monkey_island/cc/resources/local_run.py

@@ -1,4 +1,5 @@
 import json
+import logging
 import os
 import sys
 from shutil import copyfile
@@ -15,7 +16,6 @@ from monkey_island.cc.services.node import NodeService
 
 __author__ = 'Barak'
 
-import logging
 
 logger = logging.getLogger(__name__)