p20319658
/
monkey
forked from p34709852/monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Agent: Use NetworkPort instead of Port

This commit is contained in:
vakarisz 2022-10-03 14:45:29 +03:00
parent fd8ea53e8b
commit 80a095b657
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
monkey/infection_monkey/master/ip_scan_results.py
View File

@ -1,15 +1,14 @@
from dataclasses import dataclass from dataclasses import dataclass
from typing import Dict from typing import Dict
from common.types import PingScanData from common.types import NetworkPort, PingScanData
from infection_monkey.i_puppet import FingerprintData, PortScanData from infection_monkey.i_puppet import FingerprintData, PortScanData
Port = int
FingerprinterName = str FingerprinterName = str
@dataclass @dataclass
class IPScanResults: class IPScanResults:
ping_scan_data: PingScanData ping_scan_data: PingScanData
port_scan_data: Dict[Port, PortScanData] port_scan_data: Dict[NetworkPort, PortScanData]
fingerprint_data: Dict[FingerprinterName, FingerprintData] fingerprint_data: Dict[FingerprinterName, FingerprintData]

6
monkey/infection_monkey/master/propagator.py
View File

@ -10,7 +10,7 @@ from common.agent_configuration import (
PropagationConfiguration, PropagationConfiguration,
ScanTargetConfiguration, ScanTargetConfiguration,
) )
from common.types import PingScanData, PortStatus from common.types import NetworkPort, PingScanData, PortStatus
from infection_monkey.i_puppet import ExploiterResultData, FingerprintData, PortScanData from infection_monkey.i_puppet import ExploiterResultData, FingerprintData, PortScanData
from infection_monkey.model import VictimHost, VictimHostFactory from infection_monkey.model import VictimHost, VictimHostFactory
from infection_monkey.network import NetworkAddress from infection_monkey.network import NetworkAddress
@ -21,7 +21,7 @@ from infection_monkey.telemetry.scan_telem import ScanTelem
from infection_monkey.utils.threading import create_daemon_thread from infection_monkey.utils.threading import create_daemon_thread
from . import Exploiter, IPScanner, IPScanResults from . import Exploiter, IPScanner, IPScanResults
from .ip_scan_results import FingerprinterName, Port from .ip_scan_results import FingerprinterName
logger = logging.getLogger() logger = logging.getLogger()
@ -146,7 +146,7 @@ class Propagator:
@staticmethod @staticmethod
def _process_tcp_scan_results( def _process_tcp_scan_results(
victim_host: VictimHost, port_scan_data: Mapping[Port, PortScanData] victim_host: VictimHost, port_scan_data: Mapping[NetworkPort, PortScanData]
): ):
for psd in filter( for psd in filter(
lambda scan_data: scan_data.status == PortStatus.OPEN, port_scan_data.values() lambda scan_data: scan_data.status == PortStatus.OPEN, port_scan_data.values()