p15670423
/
monkey
1
0
Fork 5
Code Issues Pull Requests 3 Projects Releases Wiki Activity

Agent: Catch exceptions in IPScanner so thread doesn't crash

This commit is contained in:
Shreya Malviya 2022-04-05 18:27:53 +05:30
parent 9495027678
commit f9a6afffb4
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,16 +61,30 @@ class IPScanner:
address = addresses.get_nowait() address = addresses.get_nowait()
logger.info(f"Scanning {address.ip}") logger.info(f"Scanning {address.ip}")
# TODO: Catch exceptions to prevent thread from crashing try:
ping_scan_data = self._puppet.ping(address.ip, icmp_timeout) ping_scan_data = self._puppet.ping(address.ip, icmp_timeout)
port_scan_data = self._puppet.scan_tcp_ports(address.ip, tcp_ports, tcp_timeout) except Exception as ex:
logger.debug(f"Exception encountered when pinging {address.ip}: {str(ex)}")
try:
port_scan_data = self._puppet.scan_tcp_ports(address.ip, tcp_ports, tcp_timeout)
except Exception as ex:
logger.debug(
f"Exception encountered when scanning TCP ports on {address.ip}: {str(ex)}"
)
fingerprint_data = {} fingerprint_data = {}
if IPScanner.port_scan_found_open_port(port_scan_data): if IPScanner.port_scan_found_open_port(port_scan_data):
fingerprinters = options["fingerprinters"] fingerprinters = options["fingerprinters"]
fingerprint_data = self._run_fingerprinters( try:
address.ip, fingerprinters, ping_scan_data, port_scan_data, stop fingerprint_data = self._run_fingerprinters(
) address.ip, fingerprinters, ping_scan_data, port_scan_data, stop
)
except Exception as ex:
logger.debug(
f"Exception encountered running fingerprinters on {address.ip}: "
f"{str(ex)}"
)
scan_results = IPScanResults(ping_scan_data, port_scan_data, fingerprint_data) scan_results = IPScanResults(ping_scan_data, port_scan_data, fingerprint_data)
results_callback(address, scan_results) results_callback(address, scan_results)