oxbrbtx/PrimAITE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Port scan

Browse Source
This commit is contained in:
Marek Wolan
2024-09-26 15:35:50 +01:00
parent 50e2234a69
commit f2b6d68b14
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/primaite/simulator/system/applications/nmap.py
View File

@@ -348,7 +348,7 @@ class NMAP(Application, identifier="NMAP"):
if is_valid_port(target_port): if is_valid_port(target_port):
target_port = [target_port] target_port = [target_port]
elif target_port is None: elif target_port is None:
target_port = [port for port in PORT_LOOKUP if port not in {PORT_LOOKUP["NONE"], PORT_LOOKUP["UNUSED"]}] target_port = [PORT_LOOKUP[port] for port in PORT_LOOKUP if port not in {"NONE", "UNUSED"}]
if is_valid_protocol(target_protocol): if is_valid_protocol(target_protocol):
target_protocol = [target_protocol] target_protocol = [target_protocol]
@@ -358,7 +358,7 @@ class NMAP(Application, identifier="NMAP"):
scan_type = self._determine_port_scan_type(list(ip_addresses), target_port) scan_type = self._determine_port_scan_type(list(ip_addresses), target_port)
active_ports = {} active_ports = {}
if show: if show:
table = PrettyTable(["IP Address", "Port", "Name", "Protocol"]) table = PrettyTable(["IP Address", "Port", "Protocol"])
table.align = "l" table.align = "l"
table.title = f"{self.software_manager.node.hostname} NMAP Port Scan ({scan_type})" table.title = f"{self.software_manager.node.hostname} NMAP Port Scan ({scan_type})"
self.sys_log.info(f"{self.name}: Starting port scan") self.sys_log.info(f"{self.name}: Starting port scan")
@@ -369,13 +369,12 @@ class NMAP(Application, identifier="NMAP"):
for protocol in target_protocol: for protocol in target_protocol:
for port in set(target_port): for port in set(target_port):
port_open = self._check_port_open_on_ip_address(ip_address=ip_address, port=port, protocol=protocol) port_open = self._check_port_open_on_ip_address(ip_address=ip_address, port=port, protocol=protocol)
if port_open: if port_open:
if show: if show:
table.add_row([ip_address, port, port, protocol]) table.add_row([ip_address, port, protocol])
_ip_address = ip_address if not json_serializable else str(ip_address) _ip_address = ip_address if not json_serializable else str(ip_address)
_protocol = protocol if not json_serializable else protocol _protocol = protocol
_port = port if not json_serializable else port _port = port
if _ip_address not in active_ports: if _ip_address not in active_ports:
active_ports[_ip_address] = dict() active_ports[_ip_address] = dict()
if _protocol not in active_ports[_ip_address]: if _protocol not in active_ports[_ip_address]: