lanscape 1.2.9a1__tar.gz → 1.2.9a2__tar.gz

{lanscape-1.2.9a1 → lanscape-1.2.9a2}/MANIFEST.in

@@ -1,3 +1,4 @@
 recursive-include src/lanscape/resources *.json
+recursive-include src/lanscape/resources *.jsonc
 recursive-include src/lanscape/ui/templates *.html
 recursive-include src/lanscape/ui/static *

{lanscape-1.2.9a1/src/lanscape.egg-info → lanscape-1.2.9a2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: lanscape
-Version: 1.2.9a1
+Version: 1.2.9a2
 Summary: A python based local network scanner
 Author-email: Michael Dennis <michael@dipduo.com>
 Project-URL: Homepage, https://github.com/mdennis281/py-lanscape

{lanscape-1.2.9a1 → lanscape-1.2.9a2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "lanscape"
-version = "1.2.9a1"
+version = "1.2.9a2"
 authors = [
   { name="Michael Dennis", email="michael@dipduo.com" },
 ]

{lanscape-1.2.9a1 → lanscape-1.2.9a2}/src/lanscape/libraries/app_scope.py

@@ -1,6 +1,7 @@
 from pathlib import Path
-import importlib.util
+import json
 import sys
+import re
 
 class ResourceManager:
     """
@@ -17,6 +18,16 @@ class ResourceManager:
         with open(self.asset_dir / asset_name, 'r') as f:
             return f.read()
         
+    def get_json(self, asset_name: str):
+        return json.loads(self.get(asset_name))
+    
+    def get_jsonc(self, asset_name: str):
+        " Get JSON content with comments removed "
+        content = self.get(asset_name)
+        cleaned_content = re.sub(r'//.*', '', content)
+        return json.loads(cleaned_content)
+
+        
     def update(self, asset_name: str, content: str):
         with open(self.asset_dir / asset_name, 'w') as f:
             f.write(content)

{lanscape-1.2.9a1 → lanscape-1.2.9a2}/src/lanscape/libraries/ip_parser.py

@@ -28,7 +28,7 @@ def parse_ip_input(ip_input):
 
         # If no CIDR or range, assume a single IP
         else:
-            ip_ranges.append(ipaddress.IPv4Address(entry,strict=False))
+            ip_ranges.append(ipaddress.IPv4Address(entry))
         if len(ip_ranges) > MAX_IPS_ALLOWED:
             raise SubnetTooLargeError(ip_input)
     return ip_ranges

{lanscape-1.2.9a1 → lanscape-1.2.9a2}/src/lanscape/libraries/mac_lookup.py

@@ -1,5 +1,4 @@
 import re
-import json
 import logging
 import platform
 import subprocess
@@ -7,7 +6,7 @@ from typing import List
 
 from .app_scope import ResourceManager
 
-DB = json.loads(ResourceManager('mac_addresses').get('mac_db.json'))
+DB = ResourceManager('mac_addresses').get_json('mac_db.json')
 
 log = logging.getLogger('MacLookup')
 

{lanscape-1.2.9a1 → lanscape-1.2.9a2}/src/lanscape/libraries/net_tools.py

@@ -8,9 +8,10 @@ import ipaddress
 import traceback
 import subprocess
 from time import sleep
-from typing import List
+from typing import List, Dict
 from scapy.all import ARP, Ether, srp
 
+from .service_scan import scan_service
 from .mac_lookup import lookup_mac, get_macs
 from .ip_parser import get_address_count, MAX_IPS_ALLOWED
 
@@ -73,6 +74,7 @@ class Device(IPAlive):
         self.manufacturer: str = None
         self.ports: List[int] = []
         self.stage: str = 'found'
+        self.services: Dict[str,List[int]] = {}
         self.log = logging.getLogger('Device')
 
     def get_metadata(self):
@@ -100,6 +102,12 @@ class Device(IPAlive):
             return True
         return False
     
+    def scan_service(self,port:int):
+        service = scan_service(self.ip,port)
+        service_ports = self.services.get(service,[])
+        service_ports.append(port)
+        self.services[service] = service_ports
+    
     def get_mac(self):
         if not self.macs:
             self.macs = self._get_mac_addresses()

lanscape-1.2.9a2/src/lanscape/libraries/service_scan.py

@@ -0,0 +1,51 @@
+import asyncio
+import logging
+import traceback
+from .app_scope import ResourceManager
+
+log = logging.getLogger('ServiceScan')
+SERVICES = ResourceManager('services').get_jsonc('definitions.jsonc')
+
+# skip printer ports because they cause blank pages to be printed
+PRINTER_PORTS = [9100, 631]
+
+def scan_service(ip: str, port: int, timeout=10) -> str:
+    """
+    Synchronous function that attempts to identify the service running on a given port.
+    """
+
+    async def _async_scan_service(ip: str, port: int, timeout) -> str:
+        if port in PRINTER_PORTS:
+            return "Printer"
+        
+        try:
+            # Add a timeout to prevent hanging
+            reader, writer = await asyncio.wait_for(asyncio.open_connection(ip, port), timeout=5)
+            
+            # Send a probe appropriate for common services
+            probe = "GET / HTTP/1.1\r\nHost: {}\r\n\r\n".format(ip).encode("utf-8")
+            writer.write(probe)
+            await writer.drain()
+            
+            # Receive the response with a timeout
+            response = await asyncio.wait_for(reader.read(1024), timeout=timeout)
+            writer.close()
+            await writer.wait_closed()
+            
+            # Analyze the response to identify the service
+            response_str = response.decode("utf-8", errors="ignore")
+            for service, hints in SERVICES.items():
+                if any(hint.lower() in response_str.lower() for hint in hints):
+                    return service
+        except asyncio.TimeoutError:
+            log.warning(f"Timeout scanning {ip}:{port}")
+        except Exception as e:
+            log.error(f"Error scanning {ip}:{port}: {str(e)}")
+            log.debug(traceback.format_exc())
+        return "Unknown"
+
+    # Use asyncio.run to execute the asynchronous logic synchronously
+    return asyncio.run(_async_scan_service(ip, port,timeout=timeout))
+
+
+

{lanscape-1.2.9a1 → lanscape-1.2.9a2}/src/lanscape/libraries/subnet_scan.py

@@ -32,8 +32,31 @@ class ScanConfig:
     t_cnt_port_test: int = 128
     t_cnt_isalive: int = 256
 
+    task_scan_ports: bool = True
+    # below wont run if above false
+    task_scan_port_services: bool = True
+
     def t_cnt(self, id: str) -> int:
         return int(int(getattr(self, f't_cnt_{id}')) * float(self.t_multiplier))
+    
+    @staticmethod
+    def from_dict(data: dict) -> 'ScanConfig':
+        return ScanConfig(
+            subnet = data['subnet'],
+            port_list = data['port_list'],
+            t_multiplier = data.get('parallelism',1.0),
+            t_cnt_port_scan = data.get('t_cnt_port_scan',10),
+            t_cnt_port_test = data.get('t_cnt_port_test',128),
+            t_cnt_isalive = data.get('t_cnt_isalive',256),
+            task_scan_ports = data.get('task_scan_ports',True),
+            task_scan_port_services = data.get('task_scan_port_services',True)
+        )
+    
+    def get_ports(self) -> List[int]:
+        return PortManager().get_port_list(self.port_list).keys()
+    
+    def parse_subnet(self) -> List[ipaddress.IPv4Network]:
+        return parse_ip_input(self.subnet)
 
 
 
@@ -43,13 +66,13 @@ class SubnetScanner:
             self, 
             config: ScanConfig
         ):
-        self.subnet = parse_ip_input(config.subnet)
-        self.port_list = config.port_list
-        self.ports: list = PortManager().get_port_list(config.port_list).keys()
+        self.cfg = config
+        self.subnet = config.parse_subnet()
+        self.ports: List[int] = config.get_ports()
         self.running = False
         self.subnet_str = config.subnet
 
-        self.cfg = config
+        
         self.job_stats = JobStats()
         self.uid = str(uuid.uuid4())
         self.results = ScannerResults(self)
@@ -81,7 +104,8 @@ class SubnetScanner:
                 
         
         self._set_stage('testing ports')
-        self._scan_network_ports()
+        if self.cfg.task_scan_ports:
+            self._scan_network_ports()
         self.running = False
         self._set_stage('complete')
         
@@ -134,17 +158,23 @@ class SubnetScanner:
 
         
 
-    def debug_active_scan(self):
+    def debug_active_scan(self,sleep_sec=1):
         """
             Run this after running scan_subnet_threaded 
             to see the progress of the scan
         """
         while self.running:
+            percent = self.calc_percent_complete()
+            t_elapsed = time() - self.results.start_time
+            t_remain = int((100-percent) * (t_elapsed / percent)) if percent else '∞'
+            buffer = f'{self.uid} - {self.subnet_str}\n'
+            buffer += f'Elapsed: {int(t_elapsed)} sec - Remain: {t_remain} sec\n'
+            buffer += f'Scanned: {self.results.devices_scanned}/{self.results.devices_total}'
+            buffer += f' - {percent}%\n'
+            buffer += str(self.job_stats)
             os.system('cls' if os.name == 'nt' else 'clear')
-            print(f'{self.uid} - {self.subnet_str}')
-            print(f"Scanned: {self.results.devices_scanned}/{self.results.devices_total} - {self.calc_percent_complete()}%")
-            print(self.job_stats)
-            sleep(1)
+            print(buffer)
+            sleep(sleep_sec)
 
     @terminator
     @job_tracker
@@ -187,9 +217,13 @@ class SubnetScanner:
     def _test_port(self,host: Device, port: int):
         """
         Test if a port is open on a given host.
+        If port open, determine service.
         Device class handles tracking open ports.
         """
-        return host.test_port(port)
+        is_alive = host.test_port(port)
+        if is_alive and self.cfg.task_scan_port_services:
+            host.scan_service(port)
+        return is_alive
     
         
     @terminator
@@ -209,7 +243,7 @@ class SubnetScanner:
 class ScannerResults:
     def __init__(self,scan: SubnetScanner):
         self.scan = scan
-        self.port_list: str = scan.port_list
+        self.port_list: str = scan.cfg.port_list
         self.subnet: str = scan.subnet_str
         self.uid = scan.uid
 
@@ -263,7 +297,7 @@ class ScannerResults:
     def __str__(self):
         # Prepare data for tabulate
         data = [
-            [device.ip, device.hostname, device.mac_addr, ", ".join(map(str, device.ports))]
+            [device.ip, device.hostname, device.get_mac(), ", ".join(map(str, device.ports))]
             for device in self.devices
         ]
 

lanscape-1.2.9a2/src/lanscape/resources/services/definitions.jsonc

@@ -0,0 +1,456 @@
+{
+    // ----------------------- Web Services -----------------------
+    "HTTP": [
+        "HTTP", 
+        "Apache", 
+        "Nginx", 
+        "IIS", 
+        "lighttpd", 
+        "Caddy", 
+        "OpenResty",
+        "GWS",  // Google Web Server
+        "LiteSpeed",
+        "Gunicorn",  // Often in X-Powered-By
+        "OpenLiteSpeed",
+        "Cloudflare"
+    ],
+    "HTTPS": [
+        "HTTPS", 
+        "SSL", 
+        "TLS"
+        // Possibly you'd see "443" in a banner or SNI reference, 
+        // but typically "SSL" or "TLS" coverage is sufficient
+    ],
+
+    // ------------------ Remote Shell / Admin --------------------
+    "SSH": [
+        "SSH", 
+        "OpenSSH", 
+        "Dropbear",
+        "libssh"
+    ],
+    "Telnet": [
+        "Telnet",
+        "BusyBox on telnetd"
+    ],
+
+    // ------------------ File Transfer Protocols -----------------
+    "FTP": [
+        "FTP", 
+        "FileZilla", 
+        "ProFTPD", 
+        "vsftpd", 
+        "Pure-FTPd",
+        "WS_FTP",
+        "Microsoft ftpd"
+    ],
+    "SFTP": [
+        "SFTP"
+        // SFTP typically is an SSH subsystem, so you'd often see an SSH banner anyway
+    ],
+    "TFTP": [
+        "TFTP"
+    ],
+
+    // -------------------- Email / Messaging ----------------------
+    "SMTP": [
+        "SMTP", 
+        "Postfix", 
+        "Exim", 
+        "Sendmail", 
+        "Qmail", 
+        "Exchange"
+    ],
+    "SMTPS": [
+        "SMTPS", 
+        "465 secure", 
+        "587 secure"
+        // Some servers might mention "TLS wrapper" or similar
+    ],
+    "POP3": [
+        "POP3",
+        "Dovecot",
+        "Courier",
+        "POP3 (Internet Mail)"
+    ],
+    "POP3S": [
+        "POP3S",
+        "SSL POP3",
+        "Dovecot",
+        "Courier"
+    ],
+    "IMAP": [
+        "IMAP",
+        "Dovecot",
+        "Courier",
+        "Cyrus",
+        "IMAP4"
+    ],
+    "IMAPS": [
+        "IMAPS",
+        "SSL IMAP",
+        "Dovecot",
+        "Courier",
+        "Cyrus"
+    ],
+
+    // ---------------- Domain / Directory Services ---------------
+    "DNS": [
+        "DNS", 
+        "Bind", 
+        "DNSMasq", 
+        "PowerDNS",
+        "Unbound",
+        "Microsoft DNS",
+        "Knot DNS"
+    ],
+    "LDAP": [
+        "LDAP"
+    ],
+    "Active Directory": [
+        "Active Directory", 
+        "Kerberos", 
+        "MSAD", 
+        "LDAP for AD", 
+        "LDAP Service (AD)"
+    ],
+
+    // -------------------- Database Services ----------------------
+    "MySQL": [
+        "MySQL", 
+        "MariaDB", 
+        "Percona"
+    ],
+    "PostgreSQL": [
+        "PostgreSQL",
+        "Postgres"
+    ],
+    "Microsoft SQL Server": [
+        "MSSQL", 
+        "Microsoft SQL Server", 
+        "TDS",
+        "SQL Server",
+        "MS-SQL"
+    ],
+    "Oracle Database": [
+        "Oracle", 
+        "TNS", 
+        "Oracle Net"
+    ],
+    "MongoDB": [
+        "MongoDB"
+    ],
+    "Redis": [
+        "Redis"
+    ],
+    "Cassandra": [
+        "Cassandra"
+    ],
+    "Memcached": [
+        "Memcached"
+    ],
+
+    // ----------------- Caching / Indexing / Logging -------------
+    "Elasticsearch": [
+        "Elasticsearch"
+    ],
+    "Logstash": [
+        "Logstash"
+    ],
+
+    // --------------- Message Brokers & Streaming ----------------
+    "Kafka": [
+        "Kafka"
+    ],
+    "RabbitMQ": [
+        "RabbitMQ", 
+        "AMQP"
+    ],
+    "ActiveMQ": [
+        "ActiveMQ"
+    ],
+    "Mosquitto": [
+        "Mosquitto", 
+        "MQTT"
+    ],
+
+    // -------------------- Microsoft Services ---------------------
+    "RDP": [
+        "RDP", 
+        "Terminal Services", 
+        "Remote Desktop",
+        "MSTerminal"
+    ],
+    "SMB": [
+        "SMB", 
+        "NetBIOS", 
+        "Samba"
+    ],
+    "WMI": [
+        "WMI"
+    ],
+    "WinRM": [
+        "WinRM"
+    ],
+
+    // ---------------- Collaboration / Chat -----------------------
+    "IRC": [
+        "IRC"
+    ],
+    "XMPP": [
+        "XMPP", 
+        "Jabber"
+    ],
+    "Matrix": [
+        "Matrix"
+    ],
+
+    // ------------- Virtualization / Container Services ----------
+    "Docker API": [
+        "Docker"
+    ],
+    "Kubernetes API": [
+        "Kubernetes",
+        "K8s",
+        "kube-apiserver"
+    ],
+    "VMware ESXi": [
+        "VMware ESXi", 
+        "ESX"
+    ],
+    "Proxmox": [
+        "Proxmox"
+    ],
+
+    // ----------------- Remote Desktop / Control -----------------
+    "VNC": [
+        "VNC", 
+        "RFB"
+    ],
+    "TeamViewer": [
+        "TeamViewer"
+    ],
+    "AnyDesk": [
+        "AnyDesk"
+    ],
+
+    // --------------------- Voice over IP ------------------------
+    "SIP": [
+        "SIP", 
+        "Asterisk", 
+        "FreeSWITCH"
+    ],
+    "H.323": [
+        "H.323"
+    ],
+
+    // ----------- Time, Network Config, and Infrastructure -------
+    "NTP": [
+        "NTP"
+    ],
+    "DHCP": [
+        "DHCP"
+    ],
+
+    // ------------------ VPN / Tunneling / Security --------------
+    "OpenVPN": [
+        "OpenVPN"
+    ],
+    "IPSec": [
+        "IPSec", 
+        "IKE"
+    ],
+    "WireGuard": [
+        "WireGuard"
+    ],
+
+    // ---------------------- Other Protocols ----------------------
+    "SNMP": [
+        "SNMP"
+    ],
+    "SNMP Trap": [
+        "Trap", 
+        "SNMPTRAP"
+    ],
+    "Syslog": [
+        "Syslog"
+    ],
+
+    // -------------------- Cloud Services / APIs -----------------
+    "AWS S3": [
+        "AmazonS3", 
+        "S3"
+    ],
+    "AWS RDS": [
+        "AWS RDS", 
+        "amazon-rds"
+    ],
+    "Azure DevOps": [
+        "Azure DevOps", 
+        "VSTS"
+    ],
+    "GCP Services": [
+        "GCP", 
+        "googleapis.com"
+    ],
+
+    // -------------------- Repo / Code Hosting --------------------
+    "Git": [
+        "git-daemon"
+    ],
+    "SVN": [
+        "SVN", 
+        "Subversion"
+    ],
+
+    // -------------- HPC / Cluster Management / HPC --------------
+    "Slurm": [
+        "Slurm"
+    ],
+
+    // --------------------- Misc / Exotic ------------------------
+    "Tor": [
+        "Tor", 
+        "obfs"
+    ],
+    "ZeroTier": [
+        "ZeroTier"
+    ],
+    "Mumble": [
+        "Mumble", 
+        "Murmur"
+    ],
+    "Spice": [
+        "SPICE protocol"
+    ],
+    "FusionDirectory": [
+        "FusionDirectory"
+    ],
+    "Jenkins": [
+        "Jenkins"
+    ],
+    "GitLab": [
+        "GitLab"
+    ],
+    "GitHub": [
+        "GitHub", 
+        "github.com"
+    ],
+    "Bitbucket": [
+        "Bitbucket"
+    ],
+
+    // ------------------ Legacy or Older Protocols ---------------
+    "Gopher": [
+        "Gopher"
+    ],
+    "Finger": [
+        "Finger"
+    ],
+    "Ident": [
+        "Ident"
+    ],
+    "Rlogin": [
+        "rlogin"
+    ],
+    "Rsync": [
+        "rsync"
+    ],
+    "UUCP": [
+        "UUCP"
+    ],
+    "AFS": [
+        "AFS", 
+        "OpenAFS"
+    ],
+    "NIS": [
+        "NIS", 
+        "YPServ"
+    ],
+    "Telnet SSL": [
+        "telnet-ssl"
+    ],
+
+    // ----------------- Big Data / Hadoop Ecosystem --------------
+    "Hadoop": [
+        "Hadoop",
+        "MapReduce",
+        "YARN"
+    ],
+    "HDFS": [
+        "HDFS"
+    ],
+    "Hive": [
+        "Hive",
+        "HiveServer2"
+    ],
+    "HBase": [
+        "HBase",
+        "HMaster"
+    ],
+    "Zookeeper": [
+        "Zookeeper",
+        "ZooKeeper"
+    ],
+    "Spark": [
+        "Spark"
+    ],
+
+    // ------------ Web Frameworks / Application Servers ----------
+    "Tomcat": [
+        "Apache Tomcat",
+        "Apache-Coyote"
+    ],
+    "JBoss": [
+        "JBoss",
+        "JBoss EAP"
+    ],
+    "GlassFish": [
+        "GlassFish"
+    ],
+    "WebLogic": [
+        "WebLogic"
+    ],
+    "WebSphere": [
+        "WebSphere"
+    ],
+    "Jetty": [
+        "Jetty"
+    ],
+    // Gunicorn and uWSGI also appear under HTTP if they surface in the banner.
+
+    // ------- Additional Container / Orchestration Tools ---------
+    "Docker Swarm": [
+        "Swarm"
+    ],
+
+    // ---------- Reverse Proxies / Load Balancers / Gateways -----
+    "HAProxy": [
+        "HAProxy"
+    ],
+    "Traefik": [
+        "Traefik"
+    ],
+    "Envoy": [
+        "Envoy"
+    ],
+
+    // ------------------ CI/CD and DevOps Tools ------------------
+    "Bamboo": [
+        "Bamboo"
+    ],
+    "TeamCity": [
+        "TeamCity"
+    ],
+    "Drone CI": [
+        "Drone"
+    ],
+
+    // ------------------- Just for completeness ------------------
+    "COBOL-based service": [
+        "Mainframe", 
+        "AS/400",
+        // Banner might mention "Enterprise COBOL" or "z/OS"
+        "z/OS"
+    ]
+}

{lanscape-1.2.9a1 → lanscape-1.2.9a2}/src/lanscape/ui/blueprints/api/scan.py

@@ -35,6 +35,8 @@ def get_scan(scan_id):
 @api_bp.route('/api/scan/<scan_id>/summary',methods=['GET'])
 def get_scan_summary(scan_id):
     scan = scan_manager.get_scan(scan_id)
+    if not scan:
+        return jsonify({'error':'scan not found'}), 404
     return jsonify({
         'running': scan.running,
         'percent_complete': scan.calc_percent_complete(),

{lanscape-1.2.9a1 → lanscape-1.2.9a2}/src/lanscape/ui/static/js/main.js

@@ -164,7 +164,6 @@ function pollScanSummary(id) {
         if (summary.running || summary.stage == 'terminating') {
             progress.css('height','2px');
             progress.css('width',`${summary.percent_complete}vw`);
-            // TODO: move overview here??
             setTimeout(() => {pollScanSummary(id)},500);
         } else {
             progress.css('width','100vw');
@@ -179,6 +178,11 @@ function pollScanSummary(id) {
             },1000);
         }
         updateOverviewUI(summary);
+    }).fail(function(req) {
+        if (req === 404) {
+            console.log('Scan not found, redirecting to home');
+            window.location.href = '/';
+        }
     });
 }
 

{lanscape-1.2.9a1 → lanscape-1.2.9a2/src/lanscape.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: lanscape
-Version: 1.2.9a1
+Version: 1.2.9a2
 Summary: A python based local network scanner
 Author-email: Michael Dennis <michael@dipduo.com>
 Project-URL: Homepage, https://github.com/mdennis281/py-lanscape

{lanscape-1.2.9a1 → lanscape-1.2.9a2}/src/lanscape.egg-info/SOURCES.txt

@@ -18,6 +18,7 @@ src/lanscape/libraries/mac_lookup.py
 src/lanscape/libraries/net_tools.py
 src/lanscape/libraries/port_manager.py
 src/lanscape/libraries/runtime_args.py
+src/lanscape/libraries/service_scan.py
 src/lanscape/libraries/subnet_scan.py
 src/lanscape/libraries/version_manager.py
 src/lanscape/resources/mac_addresses/convert_csv.py
@@ -27,6 +28,7 @@ src/lanscape/resources/ports/full.json
 src/lanscape/resources/ports/large.json
 src/lanscape/resources/ports/medium.json
 src/lanscape/resources/ports/small.json
+src/lanscape/resources/services/definitions.jsonc
 src/lanscape/tests/__init__.py
 src/lanscape/tests/_helpers.py
 src/lanscape/tests/test_api.py