Merge branch 'amidaware:main' into main

Author: P6g9YHK6

scripts_staging/Win_NetworkScanner.py

@@ -3,39 +3,57 @@
 """
 This script performs a network scan on a given target or subnet.
 It checks if the target hosts are alive, and if ports 80 (HTTP) and 443 (HTTPS) are open, and optionally performs reverse DNS lookups if specified.
+
+Params
+--hostname
+
 v1.1 2/2024 silversword411
 v1.4 added open port checker
 v1.5 5/2/2024 integrated reverse DNS lookup into the ping function with 1-second timeout
+v1.6 5/31/2024 align output to columns and ports low to high
+v1.7 2/18/2025 fix columns with long host names and added response time
 
-TODO: Make subnet get automatically detected instead of assuming /24
-TODO: Compatible with Linux as well
+TODO: Make subnet get automatically detected
+TODO: run on linux as well
 """
 
 import socket
 import threading
 import subprocess
 import ipaddress
+import re
 from collections import defaultdict
 import argparse
 
+
 # Function to get the IP address of the primary network interface
 def get_host_ip():
     s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
     try:
-        s.connect(('10.255.255.255', 1))
+        s.connect(("10.255.255.255", 1))
         IP = s.getsockname()[0]
     except Exception:
-        IP = '127.0.0.1'
+        IP = "127.0.0.1"
     finally:
         s.close()
     return IP
 
-# Function to ping an IP address, check if it is alive, and optionally perform a reverse DNS lookup
+
+# Function to ping an IP address, check if it is alive, measure response time, and optionally perform a reverse DNS lookup
 def ping_ip(ip, alive_hosts, do_reverse_dns):
     try:
-        output = subprocess.check_output(["ping", "-n", "1", "-w", "1000", ip], stderr=subprocess.STDOUT, universal_newlines=True)
+        output = subprocess.check_output(
+            ["ping", "-n", "1", "-w", "1000", ip],
+            stderr=subprocess.STDOUT,
+            universal_newlines=True,
+        )
         if "Reply from" in output:
             alive_ip = ipaddress.ip_address(ip)
+            response_time = re.search(r"time[=<]\s*(\d+)ms", output)
+            response_time = (
+                int(response_time.group(1)) if response_time else -1
+            )  # If no time found, use -1
+
             hostname = "NA"
             if do_reverse_dns:
                 try:
@@ -46,10 +64,12 @@ def ping_ip(ip, alive_hosts, do_reverse_dns):
                     hostname = "unknown"
                 finally:
                     s.close()
-            alive_hosts.append((alive_ip, hostname))
+
+            alive_hosts.append((alive_ip, hostname, response_time))
     except Exception:
         pass
 
+
 # Function to check for open ports
 def check_ports(ip, port, open_ports):
     try:
@@ -60,19 +80,25 @@ def check_ports(ip, port, open_ports):
     except Exception:
         pass
 
+
 # Parse command-line arguments
 def parse_arguments():
-    parser = argparse.ArgumentParser(description="Scan network subnet for alive hosts, open ports, and optionally perform reverse DNS lookup.")
-    parser.add_argument("--hostname", help="Perform reverse DNS lookup", action="store_true")
+    parser = argparse.ArgumentParser(
+        description="Scan network subnet for alive hosts, open ports, and optionally perform reverse DNS lookup."
+    )
+    parser.add_argument(
+        "--hostname", help="Perform reverse DNS lookup", action="store_true"
+    )
     return parser.parse_args()
 
+
 # Main function to detect the subnet and scan it
 def main():
     args = parse_arguments()
     host_ip = get_host_ip()
     print(f"Detected Host IP: {host_ip}")
 
-    subnet = ipaddress.ip_network(f'{host_ip}/24', strict=False)
+    subnet = ipaddress.ip_network(f"{host_ip}/24", strict=False)
     alive_hosts = []
     open_ports = defaultdict(list)
 
@@ -90,21 +116,40 @@ def main():
 
     # Launch port checks
     port_check_threads = []
-    for host, _ in alive_hosts:
+    for host, _, _ in alive_hosts:
         for port in [22, 23, 25, 80, 443, 2525, 8443, 10443, 10000, 20000]:
             t = threading.Thread(target=check_ports, args=(str(host), port, open_ports))
             t.start()
             port_check_threads.append(t)
-    
+
     for t in port_check_threads:
         t.join()
 
-    print(f"Alive hosts in the subnet {subnet}:")
-    for host, hostname in alive_hosts:
-        ports = ', '.join(str(port) for port in open_ports[str(host)])
-        print(f"IP: {host}, {hostname}, Open Ports: {ports}")
+    # Determine column widths dynamically
+    max_hostname_length = max(
+        (len(hostname) for _, hostname, _ in alive_hosts), default=8
+    )
+    ip_column_width = 16
+    hostname_column_width = max(max_hostname_length, 12) + 2  # Minimum width of 12
+    response_time_column_width = 8
+    ports_column_width = 50  # Static width for ports
+
+    # Print header
+    header = f"{'IP':<{ip_column_width}}{'(ms)':<{response_time_column_width}}{'Hostname':<{hostname_column_width}}{'Open Ports':<{ports_column_width}}"
+    print(header)
+    print("-" * len(header))
+
+    # Print results
+    for host, hostname, response_time in alive_hosts:
+        ports = sorted(open_ports[str(host)])
+        ports_str = ", ".join(map(str, ports))
+        response_time_str = f"{response_time} ms" if response_time >= 0 else "N/A"
+        print(
+            f"{str(host):<{ip_column_width}}{response_time_str:<{response_time_column_width}}{hostname:<{hostname_column_width}}{ports_str:<{ports_column_width}}"
+        )
 
     print(f"\nTotal count of alive hosts: {len(alive_hosts)}")
 
+
 if __name__ == "__main__":
-    main()
+    main()