From 18f8594deb1a0f05c44b59e4f489ffd4cde651ac Mon Sep 17 00:00:00 2001 From: Ilija Lazoroski Date: Thu, 29 Sep 2022 19:03:21 +0200 Subject: [PATCH] Agent: Use common.PortStatus instead of i_puppet.PortStatus --- monkey/infection_monkey/i_puppet/__init__.py | 1 - monkey/infection_monkey/i_puppet/i_puppet.py | 6 ------ monkey/infection_monkey/master/ip_scanner.py | 3 ++- monkey/infection_monkey/master/propagator.py | 3 ++- .../network_scanning/elasticsearch_fingerprinter.py | 3 ++- .../infection_monkey/network_scanning/http_fingerprinter.py | 3 ++- .../infection_monkey/network_scanning/smb_fingerprinter.py | 4 ++-- monkey/infection_monkey/network_scanning/tcp_scanner.py | 3 ++- .../tests/unit_tests/infection_monkey/master/mock_puppet.py | 3 +-- .../unit_tests/infection_monkey/master/test_ip_scanner.py | 4 ++-- .../unit_tests/infection_monkey/master/test_propagator.py | 4 ++-- .../network_scanning/test_elasticsearch_fingerprinter.py | 3 ++- .../network_scanning/test_http_fingerprinter.py | 3 ++- .../network_scanning/test_mssql_fingerprinter.py | 3 ++- .../network_scanning/test_ssh_fingerprinter.py | 4 ++-- .../infection_monkey/network_scanning/test_tcp_scanner.py | 2 +- 16 files changed, 26 insertions(+), 26 deletions(-) diff --git a/monkey/infection_monkey/i_puppet/__init__.py b/monkey/infection_monkey/i_puppet/__init__.py index d38183700..2207d8ba6 100644 --- a/monkey/infection_monkey/i_puppet/__init__.py +++ b/monkey/infection_monkey/i_puppet/__init__.py @@ -4,7 +4,6 @@ from .i_puppet import ( ExploiterResultData, PortScanData, FingerprintData, - PortStatus, PostBreachData, UnknownPluginError, ) diff --git a/monkey/infection_monkey/i_puppet/i_puppet.py b/monkey/infection_monkey/i_puppet/i_puppet.py index 57e62c5bd..eea587ac2 100644 --- a/monkey/infection_monkey/i_puppet/i_puppet.py +++ b/monkey/infection_monkey/i_puppet/i_puppet.py @@ -2,7 +2,6 @@ import abc import threading from collections import namedtuple from dataclasses import dataclass -from enum import Enum from typing import Dict, Iterable, Mapping, Optional, Sequence from common.credentials import Credentials @@ -12,11 +11,6 @@ from infection_monkey.model import VictimHost from . import PluginType -class PortStatus(Enum): - OPEN = 1 - CLOSED = 2 - - class UnknownPluginError(Exception): pass diff --git a/monkey/infection_monkey/master/ip_scanner.py b/monkey/infection_monkey/master/ip_scanner.py index d1534a6f5..dd46eeb2e 100644 --- a/monkey/infection_monkey/master/ip_scanner.py +++ b/monkey/infection_monkey/master/ip_scanner.py @@ -5,12 +5,13 @@ from queue import Queue from threading import Event from typing import Callable, Dict, Sequence +from common import PortStatus from common.agent_configuration.agent_sub_configurations import ( NetworkScanConfiguration, PluginConfiguration, ) from common.types import PingScanData -from infection_monkey.i_puppet import FingerprintData, IPuppet, PortScanData, PortStatus +from infection_monkey.i_puppet import FingerprintData, IPuppet, PortScanData from infection_monkey.network import NetworkAddress from infection_monkey.utils.threading import interruptible_iter, run_worker_threads diff --git a/monkey/infection_monkey/master/propagator.py b/monkey/infection_monkey/master/propagator.py index 371dad970..2c8235cfe 100644 --- a/monkey/infection_monkey/master/propagator.py +++ b/monkey/infection_monkey/master/propagator.py @@ -4,6 +4,7 @@ from queue import Queue from threading import Event from typing import List, Mapping, Sequence +from common import PortStatus from common.agent_configuration import ( ExploitationConfiguration, NetworkScanConfiguration, @@ -11,7 +12,7 @@ from common.agent_configuration import ( ScanTargetConfiguration, ) from common.types import PingScanData -from infection_monkey.i_puppet import ExploiterResultData, FingerprintData, PortScanData, PortStatus +from infection_monkey.i_puppet import ExploiterResultData, FingerprintData, PortScanData from infection_monkey.model import VictimHost, VictimHostFactory from infection_monkey.network import NetworkAddress from infection_monkey.network_scanning.scan_target_generator import compile_scan_target_list diff --git a/monkey/infection_monkey/network_scanning/elasticsearch_fingerprinter.py b/monkey/infection_monkey/network_scanning/elasticsearch_fingerprinter.py index 0d9b69e9e..df679642a 100644 --- a/monkey/infection_monkey/network_scanning/elasticsearch_fingerprinter.py +++ b/monkey/infection_monkey/network_scanning/elasticsearch_fingerprinter.py @@ -4,9 +4,10 @@ from typing import Any, Dict import requests +from common import PortStatus from common.common_consts.network_consts import ES_SERVICE from common.types import PingScanData -from infection_monkey.i_puppet import FingerprintData, IFingerprinter, PortScanData, PortStatus +from infection_monkey.i_puppet import FingerprintData, IFingerprinter, PortScanData DISPLAY_NAME = "ElasticSearch" ES_PORT = 9200 diff --git a/monkey/infection_monkey/network_scanning/http_fingerprinter.py b/monkey/infection_monkey/network_scanning/http_fingerprinter.py index b2238217a..85393794f 100644 --- a/monkey/infection_monkey/network_scanning/http_fingerprinter.py +++ b/monkey/infection_monkey/network_scanning/http_fingerprinter.py @@ -5,8 +5,9 @@ from typing import Any, Dict, Iterable, Optional, Set, Tuple from requests import head from requests.exceptions import ConnectionError, Timeout +from common import PortStatus from common.types import PingScanData -from infection_monkey.i_puppet import FingerprintData, IFingerprinter, PortScanData, PortStatus +from infection_monkey.i_puppet import FingerprintData, IFingerprinter, PortScanData logger = logging.getLogger(__name__) diff --git a/monkey/infection_monkey/network_scanning/smb_fingerprinter.py b/monkey/infection_monkey/network_scanning/smb_fingerprinter.py index a80aaf6b4..45954caec 100644 --- a/monkey/infection_monkey/network_scanning/smb_fingerprinter.py +++ b/monkey/infection_monkey/network_scanning/smb_fingerprinter.py @@ -5,9 +5,9 @@ from typing import Dict from odict import odict -from common import OperatingSystem +from common import OperatingSystem, PortStatus from common.types import PingScanData -from infection_monkey.i_puppet import FingerprintData, IFingerprinter, PortScanData, PortStatus +from infection_monkey.i_puppet import FingerprintData, IFingerprinter, PortScanData DISPLAY_NAME = "SMB" SMB_PORT = 445 diff --git a/monkey/infection_monkey/network_scanning/tcp_scanner.py b/monkey/infection_monkey/network_scanning/tcp_scanner.py index f103f1556..89c27857b 100644 --- a/monkey/infection_monkey/network_scanning/tcp_scanner.py +++ b/monkey/infection_monkey/network_scanning/tcp_scanner.py @@ -5,8 +5,9 @@ import time from pprint import pformat from typing import Collection, Dict, Iterable, Mapping, Tuple +from common import PortStatus from common.utils import Timer -from infection_monkey.i_puppet import PortScanData, PortStatus +from infection_monkey.i_puppet import PortScanData from infection_monkey.network.tools import BANNER_READ, DEFAULT_TIMEOUT, tcp_port_to_service logger = logging.getLogger(__name__) diff --git a/monkey/tests/unit_tests/infection_monkey/master/mock_puppet.py b/monkey/tests/unit_tests/infection_monkey/master/mock_puppet.py index 33ae899ef..71d12eaad 100644 --- a/monkey/tests/unit_tests/infection_monkey/master/mock_puppet.py +++ b/monkey/tests/unit_tests/infection_monkey/master/mock_puppet.py @@ -2,7 +2,7 @@ import logging import threading from typing import Dict, Iterable, Sequence -from common import OperatingSystem +from common import OperatingSystem, PortStatus from common.credentials import Credentials, LMHash, Password, SSHKeypair, Username from common.types import PingScanData from infection_monkey.i_puppet import ( @@ -11,7 +11,6 @@ from infection_monkey.i_puppet import ( IPuppet, PluginType, PortScanData, - PortStatus, PostBreachData, ) from infection_monkey.model import VictimHost diff --git a/monkey/tests/unit_tests/infection_monkey/master/test_ip_scanner.py b/monkey/tests/unit_tests/infection_monkey/master/test_ip_scanner.py index 3175b0f63..648198928 100644 --- a/monkey/tests/unit_tests/infection_monkey/master/test_ip_scanner.py +++ b/monkey/tests/unit_tests/infection_monkey/master/test_ip_scanner.py @@ -5,7 +5,7 @@ from unittest.mock import MagicMock import pytest from tests.unit_tests.infection_monkey.master.mock_puppet import MockPuppet -from common import OperatingSystem +from common import OperatingSystem, PortStatus from common.agent_configuration.agent_sub_configurations import ( ICMPScanConfiguration, NetworkScanConfiguration, @@ -13,7 +13,7 @@ from common.agent_configuration.agent_sub_configurations import ( TCPScanConfiguration, ) from common.types import PingScanData -from infection_monkey.i_puppet import FingerprintData, PortScanData, PortStatus +from infection_monkey.i_puppet import FingerprintData, PortScanData from infection_monkey.master import IPScanner from infection_monkey.network import NetworkAddress diff --git a/monkey/tests/unit_tests/infection_monkey/master/test_propagator.py b/monkey/tests/unit_tests/infection_monkey/master/test_propagator.py index f94df4c22..5b6052973 100644 --- a/monkey/tests/unit_tests/infection_monkey/master/test_propagator.py +++ b/monkey/tests/unit_tests/infection_monkey/master/test_propagator.py @@ -4,14 +4,14 @@ from unittest.mock import MagicMock import pytest -from common import OperatingSystem +from common import OperatingSystem, PortStatus from common.agent_configuration.agent_sub_configurations import ( NetworkScanConfiguration, PropagationConfiguration, ScanTargetConfiguration, ) from common.types import PingScanData -from infection_monkey.i_puppet import ExploiterResultData, FingerprintData, PortScanData, PortStatus +from infection_monkey.i_puppet import ExploiterResultData, FingerprintData, PortScanData from infection_monkey.master import IPScanResults, Propagator from infection_monkey.model import VictimHost, VictimHostFactory from infection_monkey.network import NetworkAddress diff --git a/monkey/tests/unit_tests/infection_monkey/network_scanning/test_elasticsearch_fingerprinter.py b/monkey/tests/unit_tests/infection_monkey/network_scanning/test_elasticsearch_fingerprinter.py index 758dc4f35..be10ed1ee 100644 --- a/monkey/tests/unit_tests/infection_monkey/network_scanning/test_elasticsearch_fingerprinter.py +++ b/monkey/tests/unit_tests/infection_monkey/network_scanning/test_elasticsearch_fingerprinter.py @@ -2,8 +2,9 @@ from unittest.mock import MagicMock import pytest +from common import PortStatus from common.common_consts.network_consts import ES_SERVICE -from infection_monkey.i_puppet import PortScanData, PortStatus +from infection_monkey.i_puppet import PortScanData from infection_monkey.network_scanning.elasticsearch_fingerprinter import ( ES_PORT, ElasticSearchFingerprinter, diff --git a/monkey/tests/unit_tests/infection_monkey/network_scanning/test_http_fingerprinter.py b/monkey/tests/unit_tests/infection_monkey/network_scanning/test_http_fingerprinter.py index dde307506..d89f1d429 100644 --- a/monkey/tests/unit_tests/infection_monkey/network_scanning/test_http_fingerprinter.py +++ b/monkey/tests/unit_tests/infection_monkey/network_scanning/test_http_fingerprinter.py @@ -2,7 +2,8 @@ from unittest.mock import MagicMock import pytest -from infection_monkey.i_puppet import PortScanData, PortStatus +from common import PortStatus +from infection_monkey.i_puppet import PortScanData from infection_monkey.network_scanning.http_fingerprinter import HTTPFingerprinter OPTIONS = {"http_ports": [80, 443, 1080, 8080, 9200]} diff --git a/monkey/tests/unit_tests/infection_monkey/network_scanning/test_mssql_fingerprinter.py b/monkey/tests/unit_tests/infection_monkey/network_scanning/test_mssql_fingerprinter.py index 8ae7d7fca..a742a3775 100644 --- a/monkey/tests/unit_tests/infection_monkey/network_scanning/test_mssql_fingerprinter.py +++ b/monkey/tests/unit_tests/infection_monkey/network_scanning/test_mssql_fingerprinter.py @@ -3,7 +3,8 @@ from unittest.mock import MagicMock import pytest -from infection_monkey.i_puppet import PortScanData, PortStatus +from common import PortStatus +from infection_monkey.i_puppet import PortScanData from infection_monkey.network_scanning.mssql_fingerprinter import ( MSSQL_SERVICE, SQL_BROWSER_DEFAULT_PORT, diff --git a/monkey/tests/unit_tests/infection_monkey/network_scanning/test_ssh_fingerprinter.py b/monkey/tests/unit_tests/infection_monkey/network_scanning/test_ssh_fingerprinter.py index 969104e57..4b021d1fa 100644 --- a/monkey/tests/unit_tests/infection_monkey/network_scanning/test_ssh_fingerprinter.py +++ b/monkey/tests/unit_tests/infection_monkey/network_scanning/test_ssh_fingerprinter.py @@ -1,7 +1,7 @@ import pytest -from common import OperatingSystem -from infection_monkey.i_puppet import FingerprintData, PortScanData, PortStatus +from common import OperatingSystem, PortStatus +from infection_monkey.i_puppet import FingerprintData, PortScanData from infection_monkey.network_scanning.ssh_fingerprinter import SSHFingerprinter diff --git a/monkey/tests/unit_tests/infection_monkey/network_scanning/test_tcp_scanner.py b/monkey/tests/unit_tests/infection_monkey/network_scanning/test_tcp_scanner.py index 837b3da0d..a56782090 100644 --- a/monkey/tests/unit_tests/infection_monkey/network_scanning/test_tcp_scanner.py +++ b/monkey/tests/unit_tests/infection_monkey/network_scanning/test_tcp_scanner.py @@ -2,7 +2,7 @@ from unittest.mock import MagicMock import pytest -from infection_monkey.i_puppet import PortStatus +from common import PortStatus from infection_monkey.network_scanning import scan_tcp_ports from infection_monkey.network_scanning.tcp_scanner import EMPTY_PORT_SCAN