lanscape 1.3.7__tar.gz → 1.3.8a1__tar.gz

{lanscape-1.3.7/lanscape.egg-info → lanscape-1.3.8a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lanscape
-Version: 1.3.7
+Version: 1.3.8a1
 Summary: A python based local network scanner
 Author-email: Michael Dennis <michael@dipduo.com>
 License-Expression: MIT

{lanscape-1.3.7 → lanscape-1.3.8a1}/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.7 → lanscape-1.3.8a1/lanscape.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lanscape
-Version: 1.3.7
+Version: 1.3.8a1
 Summary: A python based local network scanner
 Author-email: Michael Dennis <michael@dipduo.com>
 License-Expression: MIT

{lanscape-1.3.7 → lanscape-1.3.8a1}/pyproject.toml

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

{lanscape-1.3.7 → lanscape-1.3.8a1}/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,13 +158,35 @@ 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: