lanscape 1.3.6b1__tar.gz → 1.3.8__tar.gz

{lanscape-1.3.6b1/lanscape.egg-info → lanscape-1.3.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lanscape
-Version: 1.3.6b1
+Version: 1.3.8
 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 → lanscape-1.3.8}/README.md

@@ -6,6 +6,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: 
@@ -14,14 +15,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
@@ -49,16 +50,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 → lanscape-1.3.8}/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-1.3.6b1 → lanscape-1.3.8}/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-1.3.6b1 → lanscape-1.3.8}/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 → lanscape-1.3.8/lanscape.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lanscape
-Version: 1.3.6b1
+Version: 1.3.8
 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 → lanscape-1.3.8}/pyproject.toml

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

{lanscape-1.3.6b1 → lanscape-1.3.8}/tests/test_api.py

@@ -5,6 +5,7 @@ Tests REST API endpoints for port management, subnet validation, and scan operat
 import json
 import time
 import unittest
+from unittest.mock import patch
 
 from lanscape.ui.app import app
 from lanscape.libraries.net_tools import get_network_subnet
@@ -157,12 +158,36 @@ class ApiTestCase(unittest.TestCase):
             if count == -1:
                 self.assertFalse(data.get('valid'))
 
+    def test_default_scan_configs_adjust_for_arp_support(self):
+        """Accurate preset should fall back when ARP lookup is unavailable."""
+        with patch('lanscape.ui.blueprints.api.tools.is_arp_supported', return_value=False):
+            response = self.app.get('/api/tools/config/defaults')
+
+        self.assertEqual(response.status_code, 200)
+        configs = json.loads(response.data)
+
+        accurate_lookup = configs['accurate']['lookup_type']
+        self.assertNotIn('ARP_LOOKUP', accurate_lookup)
+        self.assertIn('POKE_THEN_ARP', accurate_lookup)
+
+    def test_default_scan_configs_keep_arp_when_supported(self):
+        """Accurate preset should retain ARP lookup when supported."""
+        with patch('lanscape.ui.blueprints.api.tools.is_arp_supported', return_value=True):
+            response = self.app.get('/api/tools/config/defaults')
+
+        self.assertEqual(response.status_code, 200)
+        configs = json.loads(response.data)
+
+        accurate_lookup = configs['accurate']['lookup_type']
+        self.assertIn('ARP_LOOKUP', accurate_lookup)
+
     def _render_scan_ui(self, scanid):
         uris = [
             '/info',
             f'/?scan_id={scanid}',
             f'/scan/{scanid}/overview',
             f'/scan/{scanid}/table',
+            f'/scan/{scanid}/table?filter=test',
             f'/export/{scanid}'
         ]
         for uri in uris: