lanscape 1.3.1a8__py3-none-any.whl → 1.3.2a6__py3-none-any.whl

lanscape/__init__.py

@@ -1,3 +1,6 @@
+"""
+Local network scanner
+"""
 from .libraries.subnet_scan import (
     SubnetScanner,
     ScanConfig,
@@ -6,4 +9,4 @@ from .libraries.subnet_scan import (
 
 from .libraries.port_manager import PortManager
 
-from .libraries import net_tools
+from .libraries import net_tools

lanscape/__main__.py

@@ -1,6 +1,9 @@
+"""
+Lanscape module entry point.
+"""
 from .ui.main import main
 
 # leveraged when calling as module ie "python -m lanscape"
 
 if __name__ == "__main__":
-    main()
+    main()

lanscape/ui/static/css/style.css

@@ -56,7 +56,7 @@ body:has(.submodule) footer {
     background-color: var(--primary-bg);
     border-radius: 8px;
     box-shadow: 0 0 10px var(--box-shadow);
-    width: 90%;
+    width: 95%;
     margin-top: 10px;
     overflow: hidden; 
 }

lanscape/ui/templates/core/scripts.html

@@ -4,6 +4,6 @@
 <script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.9.2/dist/umd/popper.min.js"></script>
 <script src="{{ url_for('static', filename='js/core.js') }}"></script>
 
-{% if not section is defined %}
+{% if section is not defined %}
 <script src="{{ url_for('static', filename='js/on-tab-close.js') }}"></script>
 {% endif %}

lanscape/ui/templates/info.html

@@ -4,7 +4,7 @@
 <div id="header">
       <!-- Header and Scan Submission Inline -->
     <div class="d-flex justify-content-start align-items-center">
-        <a href="/" class="text-decoration-none">
+        <a href="/" class="text-decoration-none" aria-label="Go to homepage">
             <h1 class="title">
                 <span>LAN</span>scape 
             </h1>

lanscape/ui/templates/main.html

@@ -4,9 +4,11 @@
 <div id="header">
       <!-- Header and Scan Submission Inline -->
     <div class="d-flex justify-content-between align-items-center flex-wrap">
-        <h1 class="title" onclick="location.reload()">
-            <span>LAN</span>scape 
-        </h1>
+        <a href="/" class="text-decoration-none" aria-label="Go to homepage">
+            <h1 class="title">
+                <span>LAN</span>scape 
+            </h1>
+        </a>
         <!-- Form -->
         <form id="scan-form" class="d-flex align-items-end">
             <div class="form-group me-2">
@@ -52,7 +54,7 @@
         <!-- ARP Error -->
         <div id="arp-error" class="{{ 'div-hide' if is_arp_supported else '' }}">
             <span>
-                Unable to discover devices using ARP. Device discovery is degraded.
+                Unable to use ARP lookup. Device discovery is degraded.
                 <a target="_blank" href="https://github.com/mdennis281/LANscape/blob/main/support/arp-issues.md">Steps to fix</a>
             </span>
         </div>

{lanscape-1.3.1a8.dist-info → lanscape-1.3.2a6.dist-info}/METADATA

@@ -1,12 +1,13 @@
 Metadata-Version: 2.4
 Name: lanscape
-Version: 1.3.1a8
+Version: 1.3.2a6
 Summary: A python based local network scanner
 Author-email: Michael Dennis <michael@dipduo.com>
+License-Expression: MIT
 Project-URL: Homepage, https://github.com/mdennis281/py-lanscape
 Project-URL: Issues, https://github.com/mdennis281/py-lanscape/issues
+Keywords: network,scanner,lan,local,python
 Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
@@ -17,7 +18,7 @@ Requires-Dist: requests<3.0,>=2.32
 Requires-Dist: setuptools
 Requires-Dist: scapy<3.0,>=2.3.2
 Requires-Dist: tabulate==0.9.0
-Requires-Dist: pytest
+Requires-Dist: pydantic
 Dynamic: license-file
 
 # LANscape

lanscape-1.3.2a6.dist-info/RECORD

@@ -0,0 +1,43 @@
+lanscape/__init__.py,sha256=dWWi_Epf3DohHEcKB49-FgB6RDNp1sioqM6RS-mvDDM,215
+lanscape/__main__.py,sha256=AoDktsJfN-9YJrq7O2zQp1tZfCR9K4iAAyycKOHwDG8,171
+lanscape/resources/mac_addresses/mac_db.json,sha256=ygtFSwNwJzDlg6hmAujdgCyzUjxt9Di75J8SO4xYIs8,2187804
+lanscape/resources/ports/full.json,sha256=Abfbi-b5yZF4jR5NS6CT6QpIDfx4Vk04gIC1fKH2ws0,1506980
+lanscape/resources/ports/large.json,sha256=jK4gkzlPT74uv4y0TvFjsaOaUcX7Cy8Zxe2bh5FYcc0,144496
+lanscape/resources/ports/medium.json,sha256=3yHAca0_pEWXK4k1wmda1eNVM6ftzcpKn5VspVwmkRs,3667
+lanscape/resources/ports/small.json,sha256=Mj3zGVG1F2eqZx2YkrLpTL8STeLcqB8_65IR67MS1Tg,397
+lanscape/resources/services/definitions.jsonc,sha256=71w9Q7r4RoBYiIMkzzO2KdEJXaSIchNccYQueqAhD4E,8842
+lanscape/ui/static/lanscape.webmanifest,sha256=0aauJk_Bybd0B2iwzJfvPcs7AX43kVHs0dtpV6_jSWk,459
+lanscape/ui/static/css/style.css,sha256=lu9078sZKrMBmT_tM6084_DDnEEMXVMziO6E-gVYkhk,16372
+lanscape/ui/static/img/ico/android-chrome-192x192.png,sha256=JmFT6KBCCuoyxMV-mLNtF9_QJbVBvfWPUizKN700fi8,18255
+lanscape/ui/static/img/ico/android-chrome-512x512.png,sha256=88Jjx_1-4XAnZYz64KP6FdTl_kYkNG2_kQIKteQwSh4,138055
+lanscape/ui/static/img/ico/apple-touch-icon.png,sha256=tEJlLwBZtF4v-NC90YCfRJQ2prTsF4i3VQLK_hnv2Mw,16523
+lanscape/ui/static/img/ico/favicon-16x16.png,sha256=HpQOZk3rziZjT1xQxKuy5WourXsfrdwuzQY1hChzBJQ,573
+lanscape/ui/static/img/ico/favicon-32x32.png,sha256=UpgiDPIHckK19udHtACiaI3ZPbmImUUcN1GcrjpEg9s,1302
+lanscape/ui/static/img/ico/favicon.ico,sha256=rs5vq0MPJ1LzzioOzOz5aQLVfrtS2nLRc920dOeReTw,15406
+lanscape/ui/static/img/ico/site.webmanifest,sha256=ep4Hzh9zhmiZF2At3Fp1dQrYQuYF_3ZPZxc1KcGBvwQ,263
+lanscape/ui/static/js/core.js,sha256=y-f8iQPIetllUY0lSCwnGbPCk5fTJbbU6Pxm3rw1EBU,1111
+lanscape/ui/static/js/layout-sizing.js,sha256=23UuKdEmRChg6fyqj3DRvcsNfMoa6MRt6dkaT0k7_UY,841
+lanscape/ui/static/js/main.js,sha256=s0ipGqmuuFHnH9KKoUVaDRJ10_YqYoJ-9r_YnbsH8Mw,7676
+lanscape/ui/static/js/on-tab-close.js,sha256=YYzNd1KMrLWW4-rFcC8EXckTRfG-pKRLA6xpdVTDt04,1417
+lanscape/ui/static/js/quietReload.js,sha256=_mHzpUsGL4Lm1hNsr3VYSOGVcgGA2y1-eZHacssTXGs,724
+lanscape/ui/static/js/shutdown-server.js,sha256=WkO7_SNSHM_6kReUoCoExIdCf7Sl7IPiSiNxpbI-r0s,469
+lanscape/ui/static/js/subnet-info.js,sha256=aytt0LkBx4FVq36TxiMEw3aM7XQLHg_ng1U2WDwZVF4,577
+lanscape/ui/static/js/subnet-selector.js,sha256=OG01pDaSOPLq3Ial0aO0CqPcob9tPZA1MZKGmQG0W7Q,366
+lanscape/ui/templates/base.html,sha256=P5xnMlvDXYkYSXdSZUWaRfhsszNuZPP7A56hemBrAFs,1498
+lanscape/ui/templates/error.html,sha256=zXFO0zPIfQORWq1ZMiSZ8G7FjfhVVr-aaYC0HeBl4Rs,1068
+lanscape/ui/templates/info.html,sha256=1ISKdR0dWoGscS--cY_h65UCdL4ldYd8B4-4k6S3QqI,2614
+lanscape/ui/templates/main.html,sha256=2PJEIRcNZSMFsuqn8rlaC-Q5qxaR6qLKnaQQce7C-Gs,4208
+lanscape/ui/templates/scan.html,sha256=Fz1Q4CzRq5qpKgszTAQLhaLVV0A6gBraT33mNDmpYRE,390
+lanscape/ui/templates/shutdown.html,sha256=v0cGT5CJWi-V8b5sUN3l-QIDNUmHTvKGi2gDlhmRlrs,724
+lanscape/ui/templates/core/head.html,sha256=6XyoDIz-IMPIRG-ti2LFY9FFX39UTIf_K6-6USni_ek,788
+lanscape/ui/templates/core/scripts.html,sha256=l9qoODOD9VDKMk2-4lsD_gwscHPXgwuDw-SkQXfXylo,649
+lanscape/ui/templates/scan/export.html,sha256=Qi0m2xJPbC5I2rxzekXjvQ6q9gm2Lr4VJW6riLhIaU0,776
+lanscape/ui/templates/scan/ip-table-row.html,sha256=ptY24rxJRaA4PEEQRDncaq6Q0ql5RJ87Kn0zKRCzOHw,4842
+lanscape/ui/templates/scan/ip-table.html,sha256=ds__UP9JiTKf5IxCmTMzw--eN_yg1Pvn3Nj1KvQxeZg,940
+lanscape/ui/templates/scan/overview.html,sha256=FsX-jSFhGKwCxZGKE8AMKk328UuawN6O9RNTzYvIOts,1205
+lanscape/ui/templates/scan/scan-error.html,sha256=Q4eZM5ThrxnFaWOSTUpK8hA2ksHwhxOBTaVUCLALhyA,1032
+lanscape-1.3.2a6.dist-info/licenses/LICENSE,sha256=cCO-NbS01Ilwc6djHjZ7LIgPFRkRmWdr0fH2ysXKioA,1090
+lanscape-1.3.2a6.dist-info/METADATA,sha256=7cqoGasowbdC4PTiGP6KpygaCjlN4x8E_A8AVvh2Rnk,2586
+lanscape-1.3.2a6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+lanscape-1.3.2a6.dist-info/top_level.txt,sha256=E9D4sjPz_6H7c85Ycy_pOS2xuv1Wm-ilKhxEprln2ps,9
+lanscape-1.3.2a6.dist-info/RECORD,,

lanscape/libraries/app_scope.py

@@ -1,70 +0,0 @@
-from pathlib import Path
-import json
-import sys
-import re
-
-class ResourceManager:
-    """
-    A class to manage assets in the resources folder.
-    Works locally and if installed based on relative path from this file
-    """
-    def __init__(self, asset_folder: str):
-        self.asset_dir = self._get_resource_path() / asset_folder
-        
-    def list(self):
-        return [p.name for p in self.asset_dir.iterdir()]
-    
-    def get(self, asset_name: str):
-        with open(self.asset_dir / asset_name, 'r') as f:
-            return f.read()
-        
-    def get_json(self, asset_name: str):
-        return json.loads(self.get(asset_name))
-    
-    def get_jsonc(self, asset_name: str):
-        " Get JSON content with comments removed "
-        content = self.get(asset_name)
-        cleaned_content = re.sub(r'//.*', '', content)
-        return json.loads(cleaned_content)
-
-        
-    def update(self, asset_name: str, content: str):
-        with open(self.asset_dir / asset_name, 'w') as f:
-            f.write(content)
-
-    def create(self, asset_name: str, content: str):
-        if (self.asset_dir / asset_name).exists():
-            raise FileExistsError(f"File {asset_name} already exists")
-        with open(self.asset_dir / asset_name, 'w') as f:
-            f.write(content)
-    
-    def delete(self, asset_name: str):
-        (self.asset_dir / asset_name).unlink()
-        
-    def _get_resource_path(self) -> Path:
-        base_dir = Path(__file__).parent.parent
-        resource_dir = base_dir / "resources"
-        return resource_dir
-
-
-
-
-def is_local_run(module_name: str = 'lanscape') -> bool:
-    """
-    Determine if the code is running locally or as an installed PyPI package.
-    """
-    module_path = Path(__file__).parent
-
-    # Check if the path is in site-packages/dist-packages
-    if module_path and any(part in module_path.parts for part in ['site-packages', 'dist-packages']):
-        return False  # Installed package
-
-    # Check for a .git directory in the path or its parents
-    if module_path and any((parent / ".git").exists() for parent in module_path.parents):
-        return True  # Local development
-
-    # Check sys.path for non-standard local paths
-    if any(not str(Path(p)).startswith(('/usr', '/lib', '/site-packages')) for p in sys.path):
-        return True  # Local run
-
-    return False  # Default to installed package

lanscape/libraries/decorators.py

@@ -1,75 +0,0 @@
-from time import time
-from dataclasses import dataclass, field
-from typing import DefaultDict
-from collections import defaultdict
-from tabulate import tabulate
-@dataclass
-class JobStats:
-    running: DefaultDict[str, int] = field(default_factory=lambda: defaultdict(int))
-    finished: DefaultDict[str, int] = field(default_factory=lambda: defaultdict(int))
-    timing: DefaultDict[str, float] = field(default_factory=lambda: defaultdict(float))
-
-    def __str__(self):
-        data = [
-            [name, self.running.get(name, 0), self.finished.get(name, 0), self.timing.get(name, 0.0)]
-            for name in set(self.running) | set(self.finished)
-        ]
-
-        headers = ["Function", "Running", "Finished", "Avg Time (s)"]
-        return tabulate(data, headers=headers, tablefmt="grid")
-
-
-def job_tracker(func):
-    fxn = func.__name__
-
-    def wrapper(*args, **kwargs):
-        # Access the class instance and initialize job tracking stats
-        class_instance = args[0]
-        job_stats = init_job_tracker(class_instance)
-
-        # Increment running counter and track execution time
-        job_stats.running[fxn] += 1
-        start = time()
-        
-        result = func(*args, **kwargs)  # Execute the wrapped function
-        
-        # Update statistics after function execution
-        elapsed = time() - start
-        job_stats.running[fxn] -= 1
-        job_stats.finished[fxn] += 1
-
-        # Calculate the new average timing for the function
-        job_stats.timing[fxn] = round(
-            ((job_stats.finished[fxn] - 1) * job_stats.timing[fxn] + elapsed) / job_stats.finished[fxn], 4
-        )
-
-        # Clean up if no more running instances of this function
-        if job_stats.running[fxn] == 0:
-            job_stats.running.pop(fxn)
-
-        return result
-
-    def init_job_tracker(class_instance):
-        # Initialize job_stats if it doesn't exist
-        if not hasattr(class_instance, 'job_stats'):
-            class_instance.job_stats = JobStats()
-        return class_instance.job_stats
-
-    return wrapper
-
-
-def terminator(func):
-    """
-    decorator designed specifically for the SubnetScanner class,
-    helps facilitate termination of a job
-    """
-    def wrapper(*args, **kwargs):
-        scan = args[0] # aka self
-        if not scan.running:
-            return
-        return func(*args, **kwargs)
-
-
-
-    return wrapper
-    

lanscape/libraries/errors.py

@@ -1,29 +0,0 @@
-
-
-class SubnetTooLargeError(Exception):
-    """Custom exception raised when the subnet size exceeds the allowed limit."""
-    def __init__(self, subnet):
-        self.subnet = subnet
-        super().__init__(f"Subnet {subnet} exceeds the limit of IP addresses.")
-
-
-class SubnetScanTerminationFailure(Exception):
-    def __init__(self,running_threads):
-        super().__init__(f'Unable to terminate active threads: {running_threads}')
-
-class DeviceError(Exception):
-    def __init__(self, e:Exception):
-        self.base: Exception = e
-        self.method = self._attempt_extract_method()
-    
-    def _attempt_extract_method(self):
-        try:
-            tb = self.base.__traceback__
-            frame = tb.tb_frame
-            return frame.f_code.co_name
-        except Exception as e:
-            print(e)
-            return 'unknown'
-        
-    def __str__(self):
-        return f'Error(source={self.method}, msg={self.base})'

lanscape/libraries/ip_parser.py

@@ -1,65 +0,0 @@
-import ipaddress
-from .errors import SubnetTooLargeError
-import re
-
-MAX_IPS_ALLOWED = 100000 
-
-def parse_ip_input(ip_input):
-    # Split input on commas for multiple entries
-    entries = [entry.strip() for entry in ip_input.split(',')]
-    ip_ranges = []
-
-    for entry in entries:
-        # Handle CIDR notation or IP/32
-        if '/' in entry:
-            net = ipaddress.IPv4Network(entry,strict=False)
-            if net.num_addresses > MAX_IPS_ALLOWED:
-                raise SubnetTooLargeError(ip_input)
-            for ip in net.hosts():
-                ip_ranges.append(ip) 
-        
-        # Handle IP range (e.g., 10.0.0.15-10.0.0.25)
-        elif '-' in entry:
-            ip_ranges += parse_ip_range(entry)
-        
-        # Handle shorthand IP range (e.g., 10.0.9.1-253)
-        elif re.search(r'\d+\-\d+', entry):
-            ip_ranges += parse_shorthand_ip_range(entry)
-
-        # If no CIDR or range, assume a single IP
-        else:
-            ip_ranges.append(ipaddress.IPv4Address(entry))
-        if len(ip_ranges) > MAX_IPS_ALLOWED:
-            raise SubnetTooLargeError(ip_input)
-    return ip_ranges
-
-def get_address_count(subnet: str):
-    try:
-        net = ipaddress.IPv4Network(subnet,strict=False)
-        return net.num_addresses
-    except:
-        return 0
-
-def parse_ip_range(entry):
-    start_ip, end_ip = entry.split('-')
-    start_ip = ipaddress.IPv4Address(start_ip.strip())
-    
-    # Handle case where the second part is a partial IP (e.g., '253')
-    if '.' not in end_ip:
-        end_ip = start_ip.exploded.rsplit('.', 1)[0] + '.' + end_ip.strip()
-    
-    end_ip = ipaddress.IPv4Address(end_ip.strip())
-    return list(ip_range_to_list(start_ip, end_ip))
-
-def parse_shorthand_ip_range(entry):
-    start_ip, end_part = entry.split('-')
-    start_ip = ipaddress.IPv4Address(start_ip.strip())
-    end_ip = start_ip.exploded.rsplit('.', 1)[0] + '.' + end_part.strip()
-    
-    return list(ip_range_to_list(start_ip, ipaddress.IPv4Address(end_ip)))
-
-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/libraries/logger.py

@@ -1,42 +0,0 @@
-import logging
-from logging.handlers import RotatingFileHandler
-import click
-
-
-def configure_logging(loglevel:str, logfile:bool, flask_logging:bool=False) -> None:
-    numeric_level = getattr(logging, loglevel.upper(), None)
-    if not isinstance(numeric_level, int):
-        raise ValueError(f'Invalid log level: {loglevel}')
-    
-    
-    logging.basicConfig(level=numeric_level, format='[%(name)s] %(levelname)s - %(message)s')
-
-    # flask spams too much on info
-    if not flask_logging:
-        disable_flask_logging()
-    
-    if logfile:
-        handler = RotatingFileHandler('lanscape.log', maxBytes=100000, backupCount=3)
-        handler.setLevel(numeric_level)
-        formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
-        handler.setFormatter(formatter)
-        logging.getLogger().addHandler(handler)
-    else:
-        # For console, it defaults to basicConfig
-        pass
-    
-def disable_flask_logging() -> None:
-
-    def override_click_logging():
-        def secho(text, file=None, nl=None, err=None, color=None, **styles):
-            pass
-
-        def echo(text, file=None, nl=None, err=None, color=None, **styles):
-            pass
-
-        click.echo = echo
-        click.secho = secho
-    werkzeug_log = logging.getLogger('werkzeug')
-    werkzeug_log.setLevel(logging.ERROR)
-
-    override_click_logging()

lanscape/libraries/mac_lookup.py

@@ -1,69 +0,0 @@
-import re
-import logging
-import platform
-import subprocess
-from typing import List
-
-from .app_scope import ResourceManager
-
-DB = ResourceManager('mac_addresses').get_json('mac_db.json')
-
-log = logging.getLogger('MacLookup')
-
-
-def lookup_mac(mac: str) -> str:
-    """
-    Lookup a MAC address in the database and return the vendor name.
-    """
-    if mac:
-        for m in DB:
-            if mac.upper().startswith(str(m).upper()):
-                return DB[m]
-    return None
-        
-def get_macs(ip: str) -> List[str]:
-    """Try to get the MAC address using Scapy, fallback to ARP if it fails."""
-    if mac := get_mac_by_scapy(ip):
-        log.debug(f"Used Scapy to resolve ip {ip} to mac {mac}")
-        return mac
-    arp = get_mac_by_arp(ip)
-    log.debug(f"Used ARP to resolve ip {ip} to mac {arp}")
-    return arp
-
-
-def get_mac_by_arp(ip: str) -> List[str]:
-    """Retrieve the last MAC address instance using the ARP command."""
-    try:
-        # Use the appropriate ARP command based on the platform
-        cmd = f"arp -a {ip}" if platform.system() == "Windows" else f"arp {ip}"
-
-        # Execute the ARP command and decode the output
-        output = subprocess.check_output(
-            cmd, shell=True
-        ).decode().replace('-', ':')
-
-        macs = re.findall(r'..:..:..:..:..:..', output)
-        # found that typically last mac is the correct one
-        return macs
-    except:
-        return []
-
-def get_mac_by_scapy(ip: str) -> List[str]:
-    """Retrieve the MAC address using the Scapy library."""
-    try:
-        from scapy.all import ARP, Ether, srp
-
-        # Construct and send an ARP request
-        arp_request = ARP(pdst=ip)
-        broadcast = Ether(dst="ff:ff:ff:ff:ff:ff")
-        packet = broadcast / arp_request
-
-        # Send the packet and wait for a response
-        result = srp(packet, timeout=1, verbose=0)[0]
-
-        # Extract the MAC addresses from the response
-        return [res[1].hwsrc for res in result]
-        # return result[0][1].hwsrc if result else None
-    except:
-        return None
-