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

Agent: Improve "options" handling in IPScanner

This commit is contained in:
Mike Salvatore 2021-12-13 08:29:56 -05:00
parent 5a1e19391d
commit 0c180a455c
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
monkey/infection_monkey/master/ip_scanner.py
View File

@ -46,7 +46,10 @@ class IPScanner:
icmp_timeout = options["icmp"]["timeout_ms"] / 1000 icmp_timeout = options["icmp"]["timeout_ms"] / 1000
ping_scan_data = self._puppet.ping(ip, icmp_timeout) ping_scan_data = self._puppet.ping(ip, icmp_timeout)
port_scan_data = self._scan_tcp_ports(ip, options["tcp"], stop)
tcp_timeout = options["tcp"]["timeout_ms"] / 1000
tcp_ports = options["tcp"]["ports"]
port_scan_data = self._scan_tcp_ports(ip, tcp_ports, tcp_timeout, stop)
results_callback(ip, ping_scan_data, port_scan_data) results_callback(ip, ping_scan_data, port_scan_data)
@ -59,14 +62,13 @@ class IPScanner:
f"ips_to_scan queue is empty, scanning thread {threading.get_ident()} exiting" f"ips_to_scan queue is empty, scanning thread {threading.get_ident()} exiting"
) )
def _scan_tcp_ports(self, ip: str, options: Dict, stop: Event): def _scan_tcp_ports(self, ip: str, ports: List[int], timeout: float, stop: Event):
tcp_timeout = options["timeout_ms"] / 1000
port_scan_data = {} port_scan_data = {}
for p in options["ports"]: for p in ports:
if stop.is_set(): if stop.is_set():
break break
port_scan_data[p] = self._puppet.scan_tcp_port(ip, p, tcp_timeout) port_scan_data[p] = self._puppet.scan_tcp_port(ip, p, timeout)
return port_scan_data return port_scan_data