lanscape 2.1.0b1__py3-none-any.whl → 2.1.2__py3-none-any.whl

lanscape/core/device_alive.py

@@ -12,8 +12,9 @@ import psutil
 from scapy.sendrecv import srp
 from scapy.layers.l2 import ARP, Ether
 from icmplib import ping
+from icmplib.exceptions import SocketPermissionError
 
-from lanscape.core.net_tools import Device
+from lanscape.core.net_tools import Device, DeviceError
 from lanscape.core.scan_config import (
     ScanConfig, ScanType, PingConfig,
     ArpConfig, PokeConfig, ArpCacheConfig
@@ -72,18 +73,84 @@ class IcmpLookup():
         Returns:
             bool: True if the device is reachable via ICMP, False otherwise.
         """
-        # Perform up to cfg.attempts rounds of ping(count=cfg.ping_count)
-        for _ in range(cfg.attempts):
-            result = ping(
-                device.ip,
-                count=cfg.ping_count,
-                interval=cfg.retry_delay,
-                timeout=cfg.timeout,
-                privileged=psutil.WINDOWS  # Use privileged mode on Windows
-            )
-            if result.is_alive:
-                device.alive = True
-                break
+        try:
+            # Try using icmplib first
+            for _ in range(cfg.attempts):
+                result = ping(
+                    device.ip,
+                    count=cfg.ping_count,
+                    interval=cfg.retry_delay,
+                    timeout=cfg.timeout,
+                    privileged=psutil.WINDOWS  # Use privileged mode on Windows
+                )
+                if result.is_alive:
+                    device.alive = True
+                    break
+            return device.alive is True
+        except SocketPermissionError:
+            # Fallback to system ping command when raw sockets aren't available
+            return cls._ping_fallback(device, cfg)
+
+    @classmethod
+    def _ping_fallback(cls, device: Device, cfg: PingConfig) -> bool:
+        """Fallback ping using system ping command via subprocess.
+
+        Args:
+            device (Device): The device to ping.
+            cfg (PingConfig): The ping configuration.
+
+        Returns:
+            bool: True if the device responds to ping, False otherwise.
+        """
+        cmd = []
+
+        if psutil.WINDOWS:
+            # -n count, -w timeout in ms
+            cmd = ['ping', '-n', str(cfg.ping_count), '-w', str(int(cfg.timeout * 1000)), device.ip]
+        else:  # Linux, macOS, and other Unix-like systems
+            # -c count, -W timeout in s
+            cmd = ['ping', '-c', str(cfg.ping_count), '-W', str(int(cfg.timeout)), device.ip]
+
+        for r in range(cfg.attempts):
+            try:
+                # Remove check=True to handle return codes manually
+                # Add timeout to prevent hanging
+                timeout_val = cfg.timeout * cfg.ping_count + 5
+                proc = subprocess.run(
+                    cmd,
+                    text=True,
+                    stdout=subprocess.PIPE,
+                    stderr=subprocess.PIPE,
+                    timeout=timeout_val,
+                    check=False  # Handle return codes manually
+                )
+
+                # Check if ping was successful
+                if proc.returncode == 0:
+                    output = proc.stdout.lower()
+
+                    # Windows/Linux both include "TTL" on a successful reply
+                    if psutil.WINDOWS or psutil.LINUX:
+                        if 'ttl' in output:
+                            device.alive = True
+                            return True  # Early return on success
+
+                    # some distributions of Linux and macOS
+                    if psutil.MACOS or psutil.LINUX:
+                        bad = '100.0% packet loss'
+                        good = 'ping statistics'
+                        # mac doesnt include TTL, so we check good is there, and bad is not
+                        if good in output and bad not in output:
+                            device.alive = True
+                            return True  # Early return on success
+
+            except (subprocess.CalledProcessError, subprocess.TimeoutExpired,
+                    FileNotFoundError) as e:
+                device.caught_errors.append(DeviceError(e))
+
+            if r < cfg.attempts - 1:
+                time.sleep(cfg.retry_delay)
+
         return device.alive is True
 
 

lanscape/core/net_tools.py

@@ -31,10 +31,10 @@ else:
 
 from lanscape.core.service_scan import scan_service
 from lanscape.core.mac_lookup import MacLookup, get_macs
-from lanscape.core.ip_parser import get_address_count, MAX_IPS_ALLOWED
+from lanscape.core.ip_parser import get_address_count, MAX_IPS_ALLOWED, parse_ip_input
 from lanscape.core.errors import DeviceError
 from lanscape.core.decorators import job_tracker, run_once, timeout_enforcer
-from lanscape.core.scan_config import ServiceScanConfig, PortScanConfig
+from lanscape.core.scan_config import ServiceScanConfig, PortScanConfig, ScanType
 
 log = logging.getLogger('NetTools')
 mac_lookup = MacLookup()
@@ -552,6 +552,56 @@ def smart_select_primary_subnet(subnets: List[dict] = None) -> str:
     return selected.get("subnet", "")
 
 
+def is_internal_block(subnet: str) -> bool:
+    """
+    Check if a subnet contains only internal/private IP addresses.
+
+    Supports CIDR notation, IP ranges, comma-separated lists, and single IPs.
+    For ranges and complex inputs, samples representative IPs for efficiency.
+
+    Args:
+        subnet: IP subnet string in various formats
+
+    Returns:
+        bool: True if all sampled IPs are private/internal, False otherwise
+    """
+    try:
+        # Handle comma-separated subnets recursively
+        if ',' in subnet:
+            return all(is_internal_block(part.strip()) for part in subnet.split(','))
+
+        # Handle CIDR notation directly
+        if '/' in subnet:
+            return ipaddress.IPv4Network(subnet, strict=False).is_private
+
+        # Handle ranges and single IPs by parsing and sampling
+        ip_list = parse_ip_input(subnet)
+        sample_ips = ([ip_list[0], ip_list[-1]] if len(ip_list) > 1 else ip_list)
+        return all(ipaddress.IPv4Address(ip).is_private for ip in sample_ips)
+
+    except (ValueError, ipaddress.AddressValueError):
+        return False  # Assume external for unparseable input
+
+
+def scan_config_uses_arp(config) -> bool:
+    """
+    Check if a scan configuration uses ARP-based scanning methods.
+
+    Args:
+        config: ScanConfig instance
+
+    Returns:
+        bool: True if the configuration uses ARP scanning, False otherwise
+    """
+    arp_scan_types = {
+        ScanType.ARP_LOOKUP,
+        ScanType.POKE_THEN_ARP,
+        ScanType.ICMP_THEN_ARP
+    }
+
+    return any(scan_type in arp_scan_types for scan_type in config.lookup_type)
+
+
 @run_once
 def is_arp_supported():
     """

lanscape/core/subnet_scan.py

@@ -22,7 +22,9 @@ from tabulate import tabulate
 # Local imports
 from lanscape.core.scan_config import ScanConfig
 from lanscape.core.decorators import job_tracker, terminator, JobStats
-from lanscape.core.net_tools import Device
+from lanscape.core.net_tools import (
+    Device, is_internal_block, scan_config_uses_arp
+)
 from lanscape.core.errors import SubnetScanTerminationFailure
 from lanscape.core.device_alive import is_device_alive
 
@@ -301,11 +303,11 @@ class ScannerResults:
         Calculate the runtime of the scan in seconds.
 
         Returns:
-            int: Runtime in seconds
+            float: Runtime in seconds
         """
         if self.scan.running:
-            return int(time() - self.start_time)
-        return int(self.end_time - self.start_time)
+            return time() - self.start_time
+        return self.end_time - self.start_time
 
     def export(self, out_type=dict) -> Union[str, dict]:
         """
@@ -385,6 +387,13 @@ class ScanManager:
         Returns:
             SubnetScanner: The newly created scan instance
         """
+        if not is_internal_block(config.subnet) and scan_config_uses_arp(config):
+            self.log.warning(
+                f"ARP scanning detected for external subnet '{config.subnet}'. "
+                "ARP requests typically only work within the local network segment. "
+                "Consider using ICMP scanning for external IP ranges."
+            )
+
         scan = SubnetScanner(config)
         self._start(scan)
         self.log.info(f'Scan started - {config}')

{lanscape-2.1.0b1.dist-info → lanscape-2.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lanscape
-Version: 2.1.0b1
+Version: 2.1.2
 Summary: A python based local network scanner
 Author-email: Michael Dennis <michael@dipduo.com>
 License-Expression: MIT
@@ -28,6 +28,8 @@ Requires-Dist: icmplib
 Provides-Extra: dev
 Requires-Dist: pytest>=8.0; extra == "dev"
 Requires-Dist: pytest-cov>=5.0; extra == "dev"
+Requires-Dist: pytest-xdist>=3.0; extra == "dev"
+Requires-Dist: openai>=1.0.0; extra == "dev"
 Dynamic: license-file
 
 # LANscape

{lanscape-2.1.0b1.dist-info → lanscape-2.1.2.dist-info}/RECORD

@@ -3,17 +3,17 @@ lanscape/__main__.py,sha256=PuY42yuCLAwHrOREJ6u2DgVyGX5hZKRQeoE9pajkNfM,170
 lanscape/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lanscape/core/app_scope.py,sha256=qfzX8Ed4bFdxHMGjgnLlWuLZDTCBKObermz91KbGVn0,3298
 lanscape/core/decorators.py,sha256=CZbPEfnLS1OF-uejQweetadzqf0pVo736jKko4Xs-g4,7264
-lanscape/core/device_alive.py,sha256=TC6c5uR-2xwT8IXcRA3NAPJ9iPhdVx9a42bGSKq9N6w,6833
+lanscape/core/device_alive.py,sha256=VY2dsoy6_MWUxcysZEFcsSoCtDkLMYzwqy0U_sbVWE0,9609
 lanscape/core/errors.py,sha256=QTf42UzR9Zxj1t1mdwfLvZIp0c9a5EItELOdCR7kTmE,1322
 lanscape/core/ip_parser.py,sha256=kn5H4ERitLnreRAqifWphwbxdjItGqwu50lsMCPDMcA,3474
 lanscape/core/logger.py,sha256=nzo6J8UdlMdhRkOJEDOIHKztoE3Du8PQZad7ixvNgeM,2534
 lanscape/core/mac_lookup.py,sha256=PxBSMe3wEVDtivCsh5NclSAguZz9rqdAS7QshBiuWvM,3519
-lanscape/core/net_tools.py,sha256=W-yyQ05k6BJc8VOnOi9_hpVD2G8i5HuQ_A39O8qk30Y,19676
+lanscape/core/net_tools.py,sha256=Ht8TkLnKf-f6E1_AkTCde-yuiwUNI57TCXke0nIFi0o,21303
 lanscape/core/port_manager.py,sha256=3_ROOb6JEiB0NByZVtADuGcldFkgZwn1RKtvwgs9AIk,4479
 lanscape/core/runtime_args.py,sha256=2vIqRrcWr-NHRSBlZGrxh1PdkPY0ytkPguu8KZqy2L8,2543
 lanscape/core/scan_config.py,sha256=A2ZKXqXKW9nrP6yLb7b9b3XqSY_cQB3LZ5K0LVCSebE,11114
 lanscape/core/service_scan.py,sha256=wTDxOdazOsbI0hwCBR__4UCmB2RIbl2pw3F2YUW9aaE,6428
-lanscape/core/subnet_scan.py,sha256=IegcrpzevL2zMf1fuvCqegUGCBXtO3iAI49aCweXmvw,14444
+lanscape/core/subnet_scan.py,sha256=PtSOk92dK05-reyr8LBkOXaI15qpYnar5nDqALCX1tQ,14850
 lanscape/core/version_manager.py,sha256=eGjyKgsv31QO0W26se9pPQ1TwmEN8qn37dHULtoocqc,2841
 lanscape/core/web_browser.py,sha256=23MuGIrBYdGhw6ejj6OWxwReeKIlWhtWukc1dKV_3_0,6736
 lanscape/resources/mac_addresses/convert_csv.py,sha256=hvlyLs0XmuuhBuvXBNRGP1cKJzYVRSf8VfUJ1VqROms,1189
@@ -69,9 +69,9 @@ lanscape/ui/templates/scan/ip-table-row.html,sha256=iSW3PYev3_k7pxTZUJUboqDUgdhs
 lanscape/ui/templates/scan/ip-table.html,sha256=AT2ZvCPYdKl-XJiAkEAawPOVuQw-w0MXumGQTr3zyKM,926
 lanscape/ui/templates/scan/overview.html,sha256=xWj9jWDPg2KcPLvS8fnSins23_UXjKCdb2NJwNG2U2Q,1176
 lanscape/ui/templates/scan/scan-error.html,sha256=wmAYQ13IJHUoO8fAGNDjMvNml7tu4rsIU3Vav71ETlA,999
-lanscape-2.1.0b1.dist-info/licenses/LICENSE,sha256=VLoE0IrNTIc09dFm7hMN0qzk4T3q8V0NaPcFQqMemDs,1070
-lanscape-2.1.0b1.dist-info/METADATA,sha256=4bfiG3YJu6XHs2bFT3OfxyCOgyafjkZk2waK0c0xjBg,3486
-lanscape-2.1.0b1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-lanscape-2.1.0b1.dist-info/entry_points.txt,sha256=evxSxUikFa1OEd4e0Boky9sLH87HdgM0YqB_AbB2HYc,51
-lanscape-2.1.0b1.dist-info/top_level.txt,sha256=E9D4sjPz_6H7c85Ycy_pOS2xuv1Wm-ilKhxEprln2ps,9
-lanscape-2.1.0b1.dist-info/RECORD,,
+lanscape-2.1.2.dist-info/licenses/LICENSE,sha256=VLoE0IrNTIc09dFm7hMN0qzk4T3q8V0NaPcFQqMemDs,1070
+lanscape-2.1.2.dist-info/METADATA,sha256=oxHxoHbAYnhTnSIgsMyzzgqevSrWmF5Fzti1bqjLAao,3578
+lanscape-2.1.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+lanscape-2.1.2.dist-info/entry_points.txt,sha256=evxSxUikFa1OEd4e0Boky9sLH87HdgM0YqB_AbB2HYc,51
+lanscape-2.1.2.dist-info/top_level.txt,sha256=E9D4sjPz_6H7c85Ycy_pOS2xuv1Wm-ilKhxEprln2ps,9
+lanscape-2.1.2.dist-info/RECORD,,