lanscape 1.3.6b1__py3-none-any.whl → 1.3.8a1__py3-none-any.whl

lanscape/libraries/device_alive.py

@@ -6,7 +6,6 @@ import re
 import socket
 import subprocess
 import time
-import random
 from typing import List
 import psutil
 
@@ -218,10 +217,13 @@ class Poker():
 
         @timeout_enforcer(enforcer_timeout, raise_on_timeout=True)
         def do_poke():
-            for _ in range(cfg.attempts):
+            # Use a small set of common ports likely to be filtered but still trigger ARP
+            common_ports = [80, 443, 22]
+            for i in range(cfg.attempts):
                 sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
                 sock.settimeout(cfg.timeout)
-                sock.connect_ex((device.ip, random.randint(1024, 65535)))  # port shouldn't matter
+                port = common_ports[i % len(common_ports)]
+                sock.connect_ex((device.ip, port))
                 sock.close()
 
         do_poke()

lanscape/libraries/scan_config.py

@@ -178,9 +178,9 @@ class ScanConfig(BaseModel):
     subnet: str
     port_list: str
     t_multiplier: float = 1.0
-    t_cnt_port_scan: int = os.cpu_count()
-    t_cnt_port_test: int = os.cpu_count() * 4
-    t_cnt_isalive: int = os.cpu_count() * 6
+    t_cnt_port_scan: int = os.cpu_count() or 4
+    t_cnt_port_test: int = (os.cpu_count() or 4) * 4
+    t_cnt_isalive: int = (os.cpu_count() or 4) * 6
 
     task_scan_ports: bool = True
     # below wont run if above false

lanscape/ui/blueprints/api/tools.py

@@ -5,7 +5,7 @@ API endpoints for subnet testing and listing.
 import traceback
 from flask import request, jsonify
 from lanscape.ui.blueprints.api import api_bp
-from lanscape.libraries.net_tools import get_all_network_subnets
+from lanscape.libraries.net_tools import get_all_network_subnets, is_arp_supported
 from lanscape.libraries.ip_parser import parse_ip_input
 from lanscape.libraries.errors import SubnetTooLargeError
 from lanscape.libraries.scan_config import DEFAULT_CONFIGS
@@ -46,7 +46,26 @@ def list_subnet():
 def get_default_configs():
     """
     Get default scan configurations.
+
+    When active ARP lookups are not supported on the host system, adjust any
+    presets that rely on ``ARP_LOOKUP`` to use the ``POKE_THEN_ARP`` fallback
+    instead. This keeps presets such as ``accurate`` usable without requiring
+    frontend overrides.
     """
-    return jsonify(
-        {key: config.to_dict() for key, config in DEFAULT_CONFIGS.items()}
-    )
+    arp_supported = is_arp_supported()
+
+    configs = {}
+    for key, config in DEFAULT_CONFIGS.items():
+        config_dict = config.to_dict()
+
+        if not arp_supported:
+            lookup_types = list(config_dict.get('lookup_type') or [])
+            if 'ARP_LOOKUP' in lookup_types:
+                lookup_types = [lt for lt in lookup_types if lt != 'ARP_LOOKUP']
+                if 'POKE_THEN_ARP' not in lookup_types:
+                    lookup_types.append('POKE_THEN_ARP')
+                config_dict['lookup_type'] = lookup_types
+
+        configs[key] = config_dict
+
+    return jsonify(configs)

{lanscape-1.3.6b1.dist-info → lanscape-1.3.8a1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lanscape
-Version: 1.3.6b1
+Version: 1.3.8a1
 Summary: A python based local network scanner
 Author-email: Michael Dennis <michael@dipduo.com>
 License-Expression: MIT
@@ -30,6 +30,7 @@ A python based local network scanner.
 
 PyPi Stats: 
 
+![Version](https://img.shields.io/pypi/v/lanscape)
 ![Monthly Downloads](https://img.shields.io/pypi/dm/lanscape)
 
 Latest release: 
@@ -38,14 +39,14 @@ Latest release:
 ![Beta](https://img.shields.io/github/v/tag/mdennis281/LANScape?filter=pre-releases%2F*b*&label=Beta)
 ![Alpha](https://img.shields.io/github/v/tag/mdennis281/LANScape?filter=pre-releases%2F*a*&label=Alpha)
 
-Tests: 
+Health: 
 
 ![pytest](https://img.shields.io/github/actions/workflow/status/mdennis281/LANscape/test.yml?branch=main&label=pytest) 
 ![packaging](https://img.shields.io/github/actions/workflow/status/mdennis281/LANscape/test-package.yml?label=packaging) 
 ![pylint](https://img.shields.io/github/actions/workflow/status/mdennis281/LANscape/pylint.yml?branch=main&label=pylint)
 
 
-## Local Run
+## Installation
 ```sh
 pip install lanscape
 python -m lanscape
@@ -73,16 +74,14 @@ The program does an ARP lookup to determine the MAC address. This lookup
 can sometimes require admin-level permissions to retrieve accurate results.
 *Try elevating your shell before execution.*
 
-### Message "WARNING: No libpcap provider available ! pcap won't be used"
-This is a missing dependency related to the ARP lookup. This is handled in the code, but you would get marginally faster/better results with this installed: [npcap download](https://npcap.com/#download)
-
 ### The accuracy of the devices found is low
-I use a combination of ARP and Ping to determine if a device is online. This method drops in stability when used in many threads. 
+I use a combination of ARP, ICMP & port testing to determine if a device is online. Sometimes the scan settings can use some tuning to maximize both speed and accuracy.
+
 Recommendations:
 
-  - Drop parallelism value (advanced dropdown)
-  - Use python > 3.10 im noticing threadpool improvements after this version
-  - Create a bug - I'm curious
+  - Adjust scan configuration
+  - Configure ARP lookup [ARP lookup setup](./support/arp-issues.md)
+  - Create a bug
 
 
 ### Something else

{lanscape-1.3.6b1.dist-info → lanscape-1.3.8a1.dist-info}/RECORD

@@ -3,7 +3,7 @@ lanscape/__main__.py,sha256=PuY42yuCLAwHrOREJ6u2DgVyGX5hZKRQeoE9pajkNfM,170
 lanscape/libraries/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lanscape/libraries/app_scope.py,sha256=EqYQRQcbjOPPcIOhFkIepcz2cKHmoUHxWj2JSoRJmzk,2542
 lanscape/libraries/decorators.py,sha256=SoNqfEInPyL-rrUKY6njK5d6Mwqu7Ix6He-BZRu2VKQ,5394
-lanscape/libraries/device_alive.py,sha256=4K-wGQr4dv-aPqMmzACYyF82uiIAfsqLTgdf8gj4Mik,6723
+lanscape/libraries/device_alive.py,sha256=mwvHJp9rWV1_zfrE57aPKOsGp06fHdzrXOuGDWiZ2T8,6851
 lanscape/libraries/errors.py,sha256=QTf42UzR9Zxj1t1mdwfLvZIp0c9a5EItELOdCR7kTmE,1322
 lanscape/libraries/ip_parser.py,sha256=RgIEvHw_oQEcjUYOrvcpbfm4KThtH8L68WyhSOJNOfE,4201
 lanscape/libraries/logger.py,sha256=nzo6J8UdlMdhRkOJEDOIHKztoE3Du8PQZad7ixvNgeM,2534
@@ -11,7 +11,7 @@ lanscape/libraries/mac_lookup.py,sha256=PxBSMe3wEVDtivCsh5NclSAguZz9rqdAS7QshBiu
 lanscape/libraries/net_tools.py,sha256=nIvOV_qYXmWIBYEd5PqWH1Mkadg3I1T0vbcHPkzlw6I,15853
 lanscape/libraries/port_manager.py,sha256=3_ROOb6JEiB0NByZVtADuGcldFkgZwn1RKtvwgs9AIk,4479
 lanscape/libraries/runtime_args.py,sha256=2vIqRrcWr-NHRSBlZGrxh1PdkPY0ytkPguu8KZqy2L8,2543
-lanscape/libraries/scan_config.py,sha256=KkY5tzuEbTbUeQrMgbn95IArgYBerFRuu-JIPsQd7AA,8310
+lanscape/libraries/scan_config.py,sha256=IOtwAaiy_f1r1KcsyTUVurOmo3kUmWdquAxWh8Gv39A,8329
 lanscape/libraries/service_scan.py,sha256=ZF4LL2gSI0T5oYEMjc8pCVtJkV1KIk4xP-AeEAkSdLc,1944
 lanscape/libraries/subnet_scan.py,sha256=lL2LzuxoTgPyvsdkPPEcZDqQPbCAGMHAjoX2slKGUKc,14136
 lanscape/libraries/version_manager.py,sha256=fIAv6bVHb_VCOrqT8Do53trxwEgR2mnZV82v3YGxJ14,2944
@@ -32,7 +32,7 @@ lanscape/ui/blueprints/__init__.py,sha256=WLnPfPE06684wArgKDDLfsW-1hKFlLe75AR7uL
 lanscape/ui/blueprints/api/__init__.py,sha256=5Z4Y7B36O-bNFenpomfuNhPuJ9dW_MC0TPUU3pCFVfA,103
 lanscape/ui/blueprints/api/port.py,sha256=8FuNcjF56wmgjoCZeaYrIakTGdshAmDjUmkjXHbaZ8I,1981
 lanscape/ui/blueprints/api/scan.py,sha256=lbwV5AciMGP-S2J_EaXcPOHeHywImzQ_bm2ZSJg-H5U,3331
-lanscape/ui/blueprints/api/tools.py,sha256=Dm5eAlWajr670H3O6note5hS_BZ888IGp2Rsdu2kXmY,1670
+lanscape/ui/blueprints/api/tools.py,sha256=IhY_ldrnVYuZKFv6gsevr9LL5gfTnmVuR95zFc05Tlo,2452
 lanscape/ui/blueprints/web/__init__.py,sha256=NvgnjP0X4LwqVhSEyh5RUzoG45N44kHK1MEFlfvBxTg,118
 lanscape/ui/blueprints/web/routes.py,sha256=883puFTHePUEgwS4a2-Co6-gdLwr5NbOx0goUck7054,3571
 lanscape/ui/static/lanscape.webmanifest,sha256=07CqA-PQsO35KJD8R96sI3Pxix6UuBjijPDCuy9vM3s,446
@@ -67,8 +67,8 @@ lanscape/ui/templates/scan/ip-table-row.html,sha256=RANDsfW4xBATdtiLrxUlRouFSjgw
 lanscape/ui/templates/scan/ip-table.html,sha256=CP7AG8WHOgy3AyYCIN0wA2wO6n0H1X0F9IOncQtpPvE,914
 lanscape/ui/templates/scan/overview.html,sha256=xWj9jWDPg2KcPLvS8fnSins23_UXjKCdb2NJwNG2U2Q,1176
 lanscape/ui/templates/scan/scan-error.html,sha256=wmAYQ13IJHUoO8fAGNDjMvNml7tu4rsIU3Vav71ETlA,999
-lanscape-1.3.6b1.dist-info/licenses/LICENSE,sha256=VLoE0IrNTIc09dFm7hMN0qzk4T3q8V0NaPcFQqMemDs,1070
-lanscape-1.3.6b1.dist-info/METADATA,sha256=gFPPjGjX9PTEDsr1ykCtccH_TmmjyFB4BoI9IiCLUas,3346
-lanscape-1.3.6b1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-lanscape-1.3.6b1.dist-info/top_level.txt,sha256=E9D4sjPz_6H7c85Ycy_pOS2xuv1Wm-ilKhxEprln2ps,9
-lanscape-1.3.6b1.dist-info/RECORD,,
+lanscape-1.3.8a1.dist-info/licenses/LICENSE,sha256=VLoE0IrNTIc09dFm7hMN0qzk4T3q8V0NaPcFQqMemDs,1070
+lanscape-1.3.8a1.dist-info/METADATA,sha256=i4IgCfXfa-omCT8BHlfD8anoaH8jHeUuqCmY3XPlI5o,3123
+lanscape-1.3.8a1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+lanscape-1.3.8a1.dist-info/top_level.txt,sha256=E9D4sjPz_6H7c85Ycy_pOS2xuv1Wm-ilKhxEprln2ps,9
+lanscape-1.3.8a1.dist-info/RECORD,,