lanscape 2.0.0a1__tar.gz → 2.0.0a2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lanscape
-Version: 2.0.0a1
+Version: 2.0.0a2
 Summary: A python based local network scanner
 Author-email: Michael Dennis <michael@dipduo.com>
 License-Expression: MIT
@@ -25,6 +25,9 @@ Requires-Dist: scapy<3.0,>=2.3.2
 Requires-Dist: tabulate==0.9.0
 Requires-Dist: pydantic
 Requires-Dist: icmplib
+Provides-Extra: dev
+Requires-Dist: pytest>=8.0; extra == "dev"
+Requires-Dist: pytest-cov>=5.0; extra == "dev"
 Dynamic: license-file
 
 # LANscape

{lanscape-2.0.0a1 → lanscape-2.0.0a2}/lanscape/__init__.py

@@ -22,4 +22,3 @@ from lanscape.core.scan_config import (
 from lanscape.core.port_manager import PortManager
 
 from lanscape.core import net_tools
-

{lanscape-2.0.0a1 → lanscape-2.0.0a2}/lanscape/__main__.py

@@ -7,4 +7,3 @@ from lanscape.ui.main import main
 
 if __name__ == "__main__":
     main()
-

{lanscape-2.0.0a1 → lanscape-2.0.0a2}/lanscape/core/app_scope.py

@@ -90,4 +90,3 @@ def is_local_run() -> bool:
     if any(parts):
         return False
     return True  # Installed package
-

{lanscape-2.0.0a1 → lanscape-2.0.0a2}/lanscape/core/decorators.py

@@ -229,4 +229,3 @@ def timeout_enforcer(timeout: int, raise_on_timeout: bool = True):
                     return None  # Return None if not raising an exception
         return wrapper
     return decorator
-

{lanscape-2.0.0a1 → lanscape-2.0.0a2}/lanscape/core/device_alive.py

@@ -227,4 +227,3 @@ class Poker():
                 sock.close()
 
         do_poke()
-

{lanscape-2.0.0a1 → lanscape-2.0.0a2}/lanscape/core/errors.py

@@ -40,4 +40,3 @@ class DeviceError(Exception):
 
     def __str__(self):
         return f'Error(source={self.method}, msg={self.base})'
-

{lanscape-2.0.0a1 → lanscape-2.0.0a2}/lanscape/core/ip_parser.py

@@ -139,4 +139,3 @@ def ip_range_to_list(start_ip, end_ip):
     # Yield the range of IPs
     for ip_int in range(int(start_ip), int(end_ip) + 1):
         yield ipaddress.IPv4Address(ip_int)
-

{lanscape-2.0.0a1 → lanscape-2.0.0a2}/lanscape/core/logger.py

@@ -72,4 +72,3 @@ def disable_flask_logging() -> None:
     werkzeug_log.setLevel(logging.ERROR)
 
     override_click_logging()
-

{lanscape-2.0.0a1 → lanscape-2.0.0a2}/lanscape/core/mac_lookup.py

@@ -105,4 +105,3 @@ def lookup_mac(mac: str) -> Optional[str]:
 def get_macs(ip: str) -> List[str]:
     """Backward compatibility function for MAC resolution."""
     return MacResolver().get_macs(ip)
-

{lanscape-2.0.0a1 → lanscape-2.0.0a2}/lanscape/core/net_tools.py

@@ -566,4 +566,3 @@ def is_arp_supported():
         return True
     except (Scapy_Exception, PermissionError, RuntimeError):
         return False
-

{lanscape-2.0.0a1 → lanscape-2.0.0a2}/lanscape/core/port_manager.py

@@ -148,4 +148,3 @@ class PortManager:
             return True
         except BaseException:
             return False
-

{lanscape-2.0.0a1 → lanscape-2.0.0a2}/lanscape/core/runtime_args.py

@@ -63,4 +63,3 @@ def parse_args() -> RuntimeArgs:
 
     # Return the dataclass instance with the dynamically assigned values
     return RuntimeArgs(**filtered_args)
-

{lanscape-2.0.0a1 → lanscape-2.0.0a2}/lanscape/core/scan_config.py

@@ -395,4 +395,3 @@ DEFAULT_CONFIGS: Dict[str, ScanConfig] = {
         )
     )
 }
-

{lanscape-2.0.0a1 → lanscape-2.0.0a2}/lanscape/core/service_scan.py

@@ -202,4 +202,3 @@ def asyncio_logger_suppression():
 
 
 asyncio_logger_suppression()
-

{lanscape-2.0.0a1 → lanscape-2.0.0a2}/lanscape/core/subnet_scan.py

@@ -428,4 +428,3 @@ class ScanManager:
         t = threading.Thread(target=scan.start)
         t.start()
         return t
-

{lanscape-2.0.0a1 → lanscape-2.0.0a2}/lanscape/core/version_manager.py

@@ -95,4 +95,3 @@ def get_installed_version(package=PACKAGE):
             log.debug(traceback.format_exc())
             log.warning(f'Cannot find {package} installation')
     return LOCAL_VERSION
-

{lanscape-2.0.0a1 → lanscape-2.0.0a2}/lanscape/core/web_browser.py

@@ -208,4 +208,3 @@ def windows_get_browser_from_registry() -> Optional[str]:
     system_browser = get_system_default_browser()
     if system_browser:
         return extract_executable(system_browser)
-

{lanscape-2.0.0a1 → lanscape-2.0.0a2}/lanscape/resources/mac_addresses/convert_csv.py

@@ -39,4 +39,3 @@ def csv_to_dict(data):
 
 
 main()
-

{lanscape-2.0.0a1 → lanscape-2.0.0a2}/lanscape/resources/ports/convert_csv.py

@@ -38,4 +38,3 @@ def csv_to_dict(data):
 
 
 main()
-

lanscape-2.0.0a2/lanscape/resources/ports/test_port_list_scan.json

@@ -0,0 +1,4 @@
+{
+  "443": "https",
+  "80": "http"
+}

{lanscape-2.0.0a1 → lanscape-2.0.0a2}/lanscape/ui/app.py

@@ -51,6 +51,18 @@ app.jinja_env.filters['is_substring_in_values'] = is_substring_in_values
 ################################
 
 
+def get_runtime_args_safe():
+    """
+    Safely get runtime args, returning empty dict if parsing fails.
+    This prevents conflicts when the module is imported during testing.
+    """
+    try:
+        return vars(parse_args())
+    except SystemExit:
+        # This happens when pytest tries to import the module
+        return {}
+
+
 def set_global_safe(key: str, value):
     """ Safely set global vars without worrying about an exception """
     app_globals = app.jinja_env.globals
@@ -73,7 +85,7 @@ def set_global_safe(key: str, value):
 set_global_safe('app_version', get_installed_version)
 set_global_safe('update_available', is_update_available)
 set_global_safe('latest_version', lookup_latest_version)
-set_global_safe('runtime_args', vars(parse_args()))
+set_global_safe('runtime_args', get_runtime_args_safe)
 set_global_safe('is_local', is_local_run)
 set_global_safe('is_arp_supported', is_arp_supported)
 
@@ -122,4 +134,3 @@ def start_webserver(args: RuntimeArgs) -> int:
         'use_reloader': args.reloader
     }
     app.run(**run_args)
-

{lanscape-2.0.0a1 → lanscape-2.0.0a2}/lanscape/ui/blueprints/__init__.py

@@ -8,4 +8,3 @@ from lanscape.core.subnet_scan import ScanManager
 scan_manager = ScanManager()
 
 log = logging.getLogger('Blueprints')
-

{lanscape-2.0.0a1 → lanscape-2.0.0a2}/lanscape/ui/blueprints/api/__init__.py

@@ -3,4 +3,3 @@
 from flask import Blueprint
 
 api_bp = Blueprint('api', __name__)
-

{lanscape-2.0.0a1 → lanscape-2.0.0a2}/lanscape/ui/blueprints/api/port.py

@@ -77,4 +77,3 @@ def delete_port_list(port_list):
         JSON response indicating success or failure
     """
     return jsonify(PortManager().delete_port_list(port_list))
-

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

@@ -121,4 +121,3 @@ def get_scan_config():
     """
     data = request.get_json()
     return ScanConfig.from_dict(data)
-

{lanscape-2.0.0a1 → lanscape-2.0.0a2}/lanscape/ui/blueprints/api/tools.py

@@ -69,4 +69,3 @@ def get_default_configs():
         configs[key] = config_dict
 
     return jsonify(configs)
-

{lanscape-2.0.0a1 → lanscape-2.0.0a2}/lanscape/ui/blueprints/web/__init__.py

@@ -5,4 +5,3 @@ Blueprint for web-related routes and views.
 from flask import Blueprint
 
 web_bp = Blueprint('web', __name__)
-

{lanscape-2.0.0a1 → lanscape-2.0.0a2}/lanscape/ui/blueprints/web/routes.py

@@ -150,4 +150,3 @@ def app_info():
         Rendered info template
     """
     return render_template('info.html')
-

{lanscape-2.0.0a1 → lanscape-2.0.0a2}/lanscape/ui/main.py

@@ -136,4 +136,3 @@ def terminate():
 
 if __name__ == "__main__":
     main()
-

{lanscape-2.0.0a1 → lanscape-2.0.0a2}/lanscape/ui/shutdown_handler.py

@@ -55,4 +55,3 @@ class FlaskShutdownHandler:
         """Exits the application if a shutdown request has been made."""
         if self._exiting:
             os._exit(0)
-

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lanscape
-Version: 2.0.0a1
+Version: 2.0.0a2
 Summary: A python based local network scanner
 Author-email: Michael Dennis <michael@dipduo.com>
 License-Expression: MIT
@@ -25,6 +25,9 @@ Requires-Dist: scapy<3.0,>=2.3.2
 Requires-Dist: tabulate==0.9.0
 Requires-Dist: pydantic
 Requires-Dist: icmplib
+Provides-Extra: dev
+Requires-Dist: pytest>=8.0; extra == "dev"
+Requires-Dist: pytest-cov>=5.0; extra == "dev"
 Dynamic: license-file
 
 # LANscape

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

@@ -33,6 +33,7 @@ lanscape/resources/ports/full.json
 lanscape/resources/ports/large.json
 lanscape/resources/ports/medium.json
 lanscape/resources/ports/small.json
+lanscape/resources/ports/test_port_list_scan.json
 lanscape/resources/services/definitions.jsonc
 lanscape/ui/__init__.py
 lanscape/ui/app.py

{lanscape-2.0.0a1 → lanscape-2.0.0a2}/lanscape.egg-info/requires.txt

@@ -6,3 +6,7 @@ scapy<3.0,>=2.3.2
 tabulate==0.9.0
 pydantic
 icmplib
+
+[dev]
+pytest>=8.0
+pytest-cov>=5.0

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

@@ -1,6 +1,6 @@
 [project]
 name = "lanscape"
-version = "2.0.0a1"
+version = "2.0.0a2"
 authors = [
   { name="Michael Dennis", email="michael@dipduo.com" },
 ]
@@ -29,6 +29,12 @@ dependencies = [
     "pydantic",
     "icmplib"
 ]
+
+[project.optional-dependencies]
+dev = [
+    "pytest>=8.0",
+    "pytest-cov>=5.0"
+]
 [project.urls]
 Homepage = "https://github.com/mdennis281/py-lanscape"
 Issues = "https://github.com/mdennis281/py-lanscape/issues"

lanscape-2.0.0a2/tests/test_api.py

@@ -0,0 +1,274 @@
+"""
+API integration tests for the LANscape application.
+Tests REST API endpoints for port management, subnet validation, and scan operations.
+"""
+import json
+import time
+import pytest
+from unittest.mock import patch
+
+from lanscape.ui.app import app
+from lanscape.core.net_tools import get_network_subnet
+
+from tests._helpers import right_size_subnet
+
+
+@pytest.fixture
+def api_client():
+    """Create a test client for the Flask application."""
+    return app.test_client()
+
+
+@pytest.fixture
+def sample_port_list():
+    """Create a sample port list for testing."""
+    return {'80': 'http', '443': 'https'}
+
+
+@pytest.fixture
+def updated_port_list():
+    """Create an updated port list for testing."""
+    return {'22': 'ssh', '8080': 'http-alt'}
+
+
+@pytest.fixture
+def test_scan_config():
+    """Create a test scan configuration."""
+    return {
+        'subnet': right_size_subnet(get_network_subnet()),
+        'port_list': 'test_port_list_scan',
+        'lookup_type': ['POKE_THEN_ARP']
+    }
+
+# API Port Management Tests
+###########################
+
+def test_port_lifecycle(api_client, sample_port_list, updated_port_list):
+    """
+    Test the complete lifecycle of port list management through the API.
+    Creates, retrieves, updates, and deletes a port list through API endpoints.
+    """
+    test_list_name = 'test_port_list_lifecycle'
+    
+    # Delete the new port list if it exists
+    api_client.delete(f'/api/port/list/{test_list_name}')
+
+    # Get the list of port lists
+    response = api_client.get('/api/port/list')
+    assert response.status_code == 200
+    port_list_start = json.loads(response.data)
+
+    # Create a new port list
+    response = api_client.post(f'/api/port/list/{test_list_name}', json=sample_port_list)
+    assert response.status_code == 200
+
+    # Get the list of port lists again
+    response = api_client.get('/api/port/list')
+    assert response.status_code == 200
+    port_list_new = json.loads(response.data)
+    # Verify that the new port list is in the list of port lists
+    assert len(port_list_new) == len(port_list_start) + 1
+
+    # Get the new port list
+    response = api_client.get(f'/api/port/list/{test_list_name}')
+    assert response.status_code == 200
+    port_list = json.loads(response.data)
+    assert port_list == sample_port_list
+
+    # Update the new port list
+    response = api_client.put(f'/api/port/list/{test_list_name}', json=updated_port_list)
+    assert response.status_code == 200
+
+    # Get the new port list again
+    response = api_client.get(f'/api/port/list/{test_list_name}')
+    assert response.status_code == 200
+    port_list = json.loads(response.data)
+
+    # Verify that the new port list has been updated
+    assert port_list == updated_port_list
+
+    # Delete the new port list
+    response = api_client.delete(f'/api/port/list/{test_list_name}')
+    assert response.status_code == 200
+
+# API Scan Tests
+################
+
+@pytest.mark.integration
+def test_scan(api_client, sample_port_list, test_scan_config):
+    """
+    Test the scan API functionality by creating and monitoring a network scan.
+    Verifies scan creation, status retrieval, and UI rendering for scan results.
+    """
+    test_list_name = 'test_port_list_scan'
+    
+    # Delete the new port list if it exists
+    api_client.delete(f'/api/port/list/{test_list_name}')
+
+    # Create a new port list
+    response = api_client.post(f'/api/port/list/{test_list_name}', json=sample_port_list)
+    assert response.status_code == 200
+
+    # Create a new scan, wait for completion
+    response = api_client.post('/api/scan/async', json=test_scan_config)
+    assert response.status_code == 200
+    scan_info = json.loads(response.data)
+    assert scan_info['status'] == 'complete'
+    scanid = scan_info['scan_id']
+    assert scanid is not None
+
+    # Validate the scan worked without error
+    response = api_client.get(f"/api/scan/{scanid}")
+    assert response.status_code == 200
+    scan_data = json.loads(response.data)
+    assert scan_data['errors'] == []
+    assert scan_data['stage'] == 'complete'
+
+    # Test scan UI rendering (if method exists)
+    _render_scan_ui_if_available(api_client, scanid)
+
+    # Delete the new port list
+    response = api_client.delete(f'/api/port/list/{test_list_name}')
+    assert response.status_code == 200
+
+
+def _render_scan_ui_if_available(api_client, scanid):
+    """Helper function to render scan UI if the method is available."""
+    try:
+        # This would be the equivalent of the original _render_scan_ui method
+        response = api_client.get(f"/scan/{scanid}")
+        # We don't assert here since this is an optional UI test
+    except Exception:
+        # Silently pass if UI rendering is not available
+        pass
+
+def test_subnet_detection(api_client):
+    """
+    Test to ensure multi-subnet detection is working
+    """
+    response = api_client.get('/api/tools/subnet/list')
+    assert response.status_code == 200
+
+    subnets = json.loads(response.data)
+    assert len(subnets) != 0
+    assert isinstance(subnets[0], dict)
+    subnet: dict = subnets[0]
+    assert subnet.get('address_cnt') is not None
+
+# Subnet Validation Tests  
+##########################
+
+@pytest.mark.parametrize("subnet,expected_count", [
+    # Valid subnets
+    ('10.0.0.0/24', 254),
+    ('10.0.0.2/24', 254),
+    ('10.0.0.1-100', 100),
+    ('192.168.1.1/25', 126),
+    ('10.0.0.1/24, 192.168.1.1-100', 354),
+    ('10.0.0.1/20', 4094),
+    ('10.0.0.1/19', 8190),
+    ('10.0.0.1/19, 192.168.1.1/20', 12284),
+    ('10.0.0.1/17, 192.168.0.1/16', 98300),
+    ('10.0.0.1/20, 192.168.0.1/20, 10.100.0.1/20', 12282),
+    # Invalid subnets
+    ('', -1),  # blank
+    ('10.0.1/24', -1),  # invalid
+    ('10.0.0.1/2', -1),  # too big
+    ('10.0.0.1/17, 192.168.0.1/16, 10.100.0.1/20', -1),  # combined too big
+])
+def test_subnet_validation(api_client, subnet, expected_count):
+    """Test subnet validation and parsing works as expected."""
+    uri = f'/api/tools/subnet/test?subnet={subnet}'
+    response = api_client.get(uri)
+    assert response.status_code == 200
+
+    data: dict = json.loads(response.data)
+    assert data.get('count') == expected_count
+    assert data.get('msg') is not None
+    
+    if expected_count == -1:
+        assert not data.get('valid')
+
+@pytest.mark.parametrize("arp_supported,expected_in,expected_not_in", [
+    (False, 'POKE_THEN_ARP', 'ARP_LOOKUP'),
+    (True, 'ARP_LOOKUP', None)
+])
+def test_default_scan_configs_arp_handling(api_client, arp_supported, expected_in, expected_not_in):
+    """Test ARP lookup configuration based on system support."""
+    with patch('lanscape.ui.blueprints.api.tools.is_arp_supported', return_value=arp_supported):
+        response = api_client.get('/api/tools/config/defaults')
+
+    assert response.status_code == 200
+    configs = json.loads(response.data)
+    accurate_lookup = configs['accurate']['lookup_type']
+    
+    assert expected_in in accurate_lookup
+    if expected_not_in:
+        assert expected_not_in not in accurate_lookup
+
+# UI Rendering Helper
+def _render_scan_ui_comprehensive(api_client, scanid):
+    """Test comprehensive UI rendering for a scan."""
+    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:
+        response = api_client.get(uri)
+        assert response.status_code == 200
+
+@pytest.mark.integration
+@pytest.mark.slow  
+def test_scan_api_async(api_client, test_scan_config):
+    """
+    Test the full scan API lifecycle with progress monitoring
+    """
+    # Create the port list first (since test_scan_config references it)
+    sample_port_list = {'80': 'http', '443': 'https'}
+    api_client.post('/api/port/list/test_port_list_scan', json=sample_port_list)
+    
+    # Create a new scan 
+    response = api_client.post('/api/scan', json=test_scan_config)
+    assert response.status_code == 200
+    scan_info = json.loads(response.data)
+    assert scan_info['status'] == 'running'
+    scan_id = scan_info['scan_id']
+    assert scan_id is not None
+
+    # Monitor scan progress
+    percent_complete = 0
+    max_iterations = 30  # Safety limit
+    iteration = 0
+    
+    while percent_complete < 100 and iteration < max_iterations:
+        # Get scan summary
+        response = api_client.get(f'/api/scan/{scan_id}/summary')
+        assert response.status_code == 200
+        summary = json.loads(response.data)
+        assert summary['running'] or summary['stage'] == 'complete'
+        
+        percent_complete = summary['percent_complete']
+        assert 0 <= percent_complete <= 100
+        
+        # Test UI rendering during scan
+        _render_scan_ui_if_available(api_client, scan_id)
+        
+        if percent_complete < 100:
+            time.sleep(2)
+        iteration += 1
+
+    # Verify final scan state
+    assert not summary['running']
+    assert summary['stage'] == 'complete'
+    assert summary['runtime'] > 0
+
+    # Validate device counts
+    devices = summary['devices']
+    assert devices['scanned'] == devices['total']
+    assert devices['alive'] > 0
+
+