lanscape 1.3.8b1__tar.gz → 1.4.0__tar.gz

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

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

{lanscape-1.3.8b1 → lanscape-1.4.0}/lanscape/libraries/decorators.py

@@ -1,7 +1,5 @@
 
-"""
-Decorators and job tracking utilities for Lanscape.
-"""
+"""Decorators and job tracking utilities for Lanscape."""
 
 from time import time
 from dataclasses import dataclass, field
@@ -10,9 +8,37 @@ from collections import defaultdict
 import inspect
 import functools
 import concurrent.futures
+import logging
 from tabulate import tabulate
 
 
+log = logging.getLogger(__name__)
+
+
+def run_once(func):
+    """Ensure a function executes only once and cache the result."""
+
+    cache_attr = "_run_once_cache"
+    ran_attr = "_run_once_ran"
+
+    @functools.wraps(func)
+    def wrapper(*args, **kwargs):
+        if getattr(wrapper, ran_attr, False):
+            return getattr(wrapper, cache_attr)
+
+        start = time()
+        result = func(*args, **kwargs)
+        elapsed = time() - start
+
+        setattr(wrapper, cache_attr, result)
+        setattr(wrapper, ran_attr, True)
+
+        log.debug("run_once executed %s in %.4fs", func.__qualname__, elapsed)
+        return result
+
+    return wrapper
+
+
 @dataclass
 class JobStats:
     """

{lanscape-1.3.8b1 → lanscape-1.4.0}/lanscape/libraries/net_tools.py

@@ -18,7 +18,7 @@ from lanscape.libraries.service_scan import scan_service
 from lanscape.libraries.mac_lookup import MacLookup, get_macs
 from lanscape.libraries.ip_parser import get_address_count, MAX_IPS_ALLOWED
 from lanscape.libraries.errors import DeviceError
-from lanscape.libraries.decorators import job_tracker
+from lanscape.libraries.decorators import job_tracker, run_once
 
 log = logging.getLogger('NetTools')
 mac_lookup = MacLookup()
@@ -459,32 +459,17 @@ def smart_select_primary_subnet(subnets: List[dict] = None) -> str:
     return selected.get("subnet", "")
 
 
-class ArpSupportChecker:
-    """
-    Singleton class to check if ARP requests are supported on the current system.
-    The check is only performed once.
-    """
-    _supported = None
-
-    @classmethod
-    def is_supported(cls):
-        """one time check if ARP requests are supported on this system"""
-        if cls._supported is not None:
-            return cls._supported
-        try:
-            arp_request = ARP(pdst='0.0.0.0')
-            broadcast = Ether(dst="ff:ff:ff:ff:ff:ff")
-            packet = broadcast / arp_request
-            srp(packet, timeout=0, verbose=False)
-            cls._supported = True
-        except (Scapy_Exception, PermissionError, RuntimeError):
-            cls._supported = False
-        return cls._supported
-
-
+@run_once
 def is_arp_supported():
     """
     Check if ARP requests are supported on the current system.
     Only runs the check once.
     """
-    return ArpSupportChecker.is_supported()
+    try:
+        arp_request = ARP(pdst='0.0.0.0')
+        broadcast = Ether(dst="ff:ff:ff:ff:ff:ff")
+        packet = broadcast / arp_request
+        srp(packet, timeout=0, verbose=False)
+        return True
+    except (Scapy_Exception, PermissionError, RuntimeError):
+        return False

{lanscape-1.3.8b1 → lanscape-1.4.0}/lanscape/libraries/version_manager.py

@@ -11,17 +11,14 @@ from random import randint
 
 import requests
 
-from .app_scope import is_local_run
+from lanscape.libraries.app_scope import is_local_run
+from lanscape.libraries.decorators import run_once
 
 log = logging.getLogger('VersionManager')
 
 PACKAGE = 'lanscape'
 LOCAL_VERSION = '0.0.0'
 
-# Used to cache PyPI version during runtime
-LATEST_VERSION = None
-
-
 def is_update_available(package=PACKAGE) -> bool:
     """
     Check if an update is available for the package.
@@ -49,6 +46,7 @@ def is_update_available(package=PACKAGE) -> bool:
     return installed != available
 
 
+@run_once
 def lookup_latest_version(package=PACKAGE):
     """
     Retrieve the latest version of the package from PyPI.
@@ -62,19 +60,18 @@ def lookup_latest_version(package=PACKAGE):
         The latest version string from PyPI or None if retrieval fails
     """
     # Fetch the latest version from PyPI
-    global LATEST_VERSION  # pylint: disable=global-statement
-    if not LATEST_VERSION:
-        no_cache = f'?cachebust={randint(0, 6969)}'
-        url = f"https://pypi.org/pypi/{package}/json{no_cache}"
-        try:
-            response = requests.get(url, timeout=5)
-            response.raise_for_status()  # Raise an exception for HTTP errors
-            LATEST_VERSION = response.json()['info']['version']
-            log.debug(f'Latest pypi version: {LATEST_VERSION}')
-        except BaseException:
-            log.debug(traceback.format_exc())
-            log.warning('Unable to fetch package version from PyPi')
-    return LATEST_VERSION
+    no_cache = f'?cachebust={randint(0, 6969)}'
+    url = f"https://pypi.org/pypi/{package}/json{no_cache}"
+    try:
+        response = requests.get(url, timeout=3)
+        response.raise_for_status()  # Raise an exception for HTTP errors
+        latest_version = response.json()['info']['version']
+        log.debug(f'Latest pypi version: {latest_version}')
+        return latest_version
+    except BaseException:
+        log.debug(traceback.format_exc())
+        log.warning('Unable to fetch package version from PyPi')
+        return None
 
 
 def get_installed_version(package=PACKAGE):

{lanscape-1.3.8b1 → lanscape-1.4.0}/lanscape/ui/static/css/style.css

@@ -115,6 +115,14 @@ hr {
     border-color: var(--border-color);
     margin: 20px 0;
 }
+
+.config-sections > .config-section {
+    border-top: 1px solid var(--border-color);
+    margin-top: 20px;
+    padding-top: 20px;
+    padding-bottom: 20px;
+}
+
 h1.title{
     cursor: pointer;
     margin: 0;

lanscape-1.4.0/lanscape/ui/templates/scan/config.html

@@ -0,0 +1,221 @@
+<div class="modal fade" id="advanced-modal" tabindex="-1" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header border-secondary">
+        <h5 class="modal-title" id="advanced-modalLabel">Advanced Settings</h5>
+        <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal" aria-label="Close"></button>
+      </div>
+      <div class="modal-body">
+        <div class="d-flex gap-2 mb-3">
+            <div class="config-option p-3 flex-fill flex-wrap" id="config-fast" data-config="fast" onclick="setScanConfig('fast')">
+                <h5 class="mb-1 d-flex align-items-center justify-content-center">
+                    <span class="material-symbols-outlined me-1">bolt</span>Fast
+                </h5>
+                <p class="mb-0">Fast scan, Low accuracy</p>
+            </div>
+            <div class="config-option p-3 flex-fill" id="config-balanced" data-config="balanced" onclick="setScanConfig('balanced')">
+                <h5 class="mb-1 d-flex align-items-center justify-content-center">
+                    <span class="material-symbols-outlined me-1">balance</span>Balanced
+                </h5>
+                <p class="mb-0">Balanced scan, Moderate accuracy</p>
+            </div>
+            <div class="config-option p-3 flex-fill" id="config-accurate" data-config="accurate" onclick="setScanConfig('accurate')">
+                <h5 class="mb-1 d-flex align-items-center justify-content-center">
+                    <span class="material-symbols-outlined me-1">target</span>Accurate
+                </h5>
+                <p class="mb-0">Thorough scan, High accuracy</p>
+            </div>
+        </div>
+
+        <div class="config-sections">
+            <div class="form-group mt-2 config-section">
+                <h6>Device Detection</h6>
+                <div class="row mt-2">
+                    <div class="col">
+                        <label class="mb-1">Lookup Type</label>
+                        <div id="lookup-type-group" class="d-flex flex-wrap gap-3">
+                            <div class="form-check">
+                                <input class="form-check-input lookup-type-input" type="checkbox" id="lookup_icmp" value="ICMP">
+                                <label class="form-check-label" for="lookup_icmp">ICMP</label>
+                            </div>
+                            <div class="form-check">
+                                <!-- ARP lookup does not always work. Depends on host system -->
+                                <input
+                                class="form-check-input lookup-type-input"
+                                type="checkbox"
+                                id="lookup_arp_lookup"
+                                value="ARP_LOOKUP"
+                                {{ '' if is_arp_supported else 'disabled' }}
+                                />
+                                <label class="form-check-label" for="lookup_arp_lookup">
+                                    ARP Lookup
+                                </label>
+                                {% if not is_arp_supported %}
+                                    <span
+                                        class="material-symbols-outlined arp-help-ico"
+                                        data-bs-toggle="tooltip"
+                                        data-bs-placement="top"
+                                        title="ARP lookup is not supported on this system, click for more info"
+                                        onclick="window.open('https://github.com/mdennis281/LANscape/blob/main/support/arp-issues.md', '_blank')"
+                                    >
+                                        help
+                                    </span>
+                                {% endif %}
+                            </div>
+                            <div class="form-check">
+                                <input class="form-check-input lookup-type-input" type="checkbox" id="lookup_icmp_then_arp" value="ICMP_THEN_ARP">
+                                <label class="form-check-label" for="lookup_icmp_then_arp">ICMP then ARP Cache</label>
+                            </div>
+                            <div class="form-check">
+                                <input class="form-check-input lookup-type-input" type="checkbox" id="lookup_poke_then_arp" value="POKE_THEN_ARP">
+                                <label class="form-check-label" for="lookup_poke_then_arp">Poke then ARP Cache</label>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col">
+                        <label for="t_cnt_isalive">Device Lookup Threads</label>
+                        <input type="number" id="t_cnt_isalive" class="form-control">
+                    </div>
+                </div>
+            </div>
+
+            <div id="section-ping" class="form-group mt-2 config-section">
+                <h6>Device Detection <span class=text-color>/</span> Ping Settings</h6>
+                <div class="row">
+                    <div class="col-3">
+                        <label for="ping_attempts" class="form-label">Ping Attempts</label>
+                        <input type="number" id="ping_attempts" class="form-control">
+                    </div>
+                    <div class="col-1 descriptor">X</div>
+                    <div class="col-3">
+                        <label for="ping_ping_count" class="form-label">Ping Count</label>
+                        <input type="number" id="ping_ping_count" class="form-control">
+                    </div>
+                    <div class="col-1 descriptor">=</div>
+                    <div class="col-3">
+                        <label for="total-ping-attempts">Max pings per device</label>
+                        <input type="number" id="total-ping-attempts" class="form-control" readonly>
+                    </div>
+                </div>
+                <div class="row mt-2">
+                    <div class="col">
+                        <label for="ping_timeout" class="form-label">Timeout Per Ping (sec)</label>
+                        <input type="number" step="0.1" id="ping_timeout" class="form-control">
+                    </div>
+                    <div class="col">
+                        <label for="ping_retry_delay" class="form-label">Delay Between Attempts (sec)</label>
+                        <input type="number" step="0.1" id="ping_retry_delay" class="form-control">
+                    </div>
+                </div>
+            </div>
+
+            <div id="section-arp" class="form-group mt-2 config-section">
+                <h6>Device Detection <span class=text-color>/</span> ARP Settings</h6>
+                <div class="row">
+                    <div class="col">
+                        <label for="arp_attempts" class="form-label">Attempts</label>
+                        <input type="number" id="arp_attempts" class="form-control">
+                    </div>
+                    <div class="col">
+                        <label for="arp_timeout" class="form-label">Timeout</label>
+                        <input type="number" step="0.1" id="arp_timeout" class="form-control">
+                    </div>
+                </div>
+            </div>
+
+            <div id="section-arp-cache" class="form-group mt-2 div-hide config-section">
+                <h6>Device Detection <span class=text-color>/</span> ARP Cache Settings</h6>
+                <div class="row">
+                    <div class="col">
+                        <label for="arp_cache_attempts" class="form-label">Attempts</label>
+                        <input type="number" id="arp_cache_attempts" class="form-control">
+                    </div>
+                    <div class="col">
+                        <label for="arp_cache_wait_before" class="form-label">Wait Before (sec)</label>
+                        <input type="number" step="0.1" id="arp_cache_wait_before" class="form-control">
+                    </div>
+                </div>
+            </div>
+
+            <div id="section-poke" class="form-group mt-2 div-hide config-section">
+                <h6>Device Detection <span class=text-color>/</span> Poke Settings</h6>
+                <div class="row">
+                    <div class="col">
+                        <label for="poke_attempts" class="form-label">Attempts</label>
+                        <input type="number" id="poke_attempts" class="form-control">
+                    </div>
+                    <div class="col">
+                        <label for="poke_timeout" class="form-label">Timeout (sec)</label>
+                        <input type="number" step="0.1" id="poke_timeout" class="form-control">
+                    </div>
+                </div>
+            </div>
+
+            <div class="form-group mt-2 config-section">
+                <h6>Port Testing</h6>
+                <div class="row">
+                    <div class="col-3">
+                        <label for="t_cnt_port_scan">Device Scan Threads</label>
+                        <input type="number" id="t_cnt_port_scan" class="form-control">
+                    </div>
+                    <div class="col-1 descriptor">X</div>
+                    <div class="col-3">
+                        <label for="t_cnt_port_test">Port Test Threads</label>
+                        <input type="number" id="t_cnt_port_test" class="form-control">
+                    </div>
+                    <div class="col-1 descriptor">=</div>
+                    <div class="col-3">
+                        <label for="total-port-tests">Total concurrent tests</label>
+                        <input type="number" id="total-port-tests" class="form-control" readonly>
+                    </div>
+                </div>
+                <div class="row mt-2">
+                    <div class="col">
+                        <label for="port_list">Port List</label>
+                        <div class="port-list-wrapper">
+                            <select id="port_list" class="port-list">
+                                <option value="both">ARP + Ping</option>
+                                <option value="arp">ARP Only</option>
+                                <option value="ping">Ping Only</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="form-group mt-2 config-section">
+                <h6>Stages</h6>
+                <div class="form-check"
+                    data-bs-toggle="tooltip"
+                    data-bs-placement="right"
+                    title="Find Devices using ARP or Ping (always on)"
+                >
+                    <input class="form-check-input" disabled type="checkbox" id="task_find_devices" checked>
+                    <label class="form-check-label" for="task_find_devices">Find Devices</label>
+                </div>
+                <div class="form-check"
+                    data-bs-toggle="tooltip"
+                    data-bs-placement="right"
+                    title="Find open ports on devices"
+                >
+                    <input class="form-check-input" type="checkbox" id="task_scan_ports">
+                    <label class="form-check-label" for="task_scan_ports">Scan Ports</label>
+                </div>
+                <div class="form-check"
+                    data-bs-toggle="tooltip"
+                    data-bs-placement="right"
+                    title="Determine services running on open ports (no supporting UI yet)"
+                >
+                    <input class="form-check-input" type="checkbox" id="task_scan_port_services">
+                    <label class="form-check-label" for="task_scan_port_services">Scan Port Services</label>
+                </div>
+            </div>
+        </div>
+
+      </div>
+      <div class="modal-footer border-secondary">
+        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+      </div>
+    </div>
+  </div>
+</div>

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

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

{lanscape-1.3.8b1 → lanscape-1.4.0}/lanscape.egg-info/SOURCES.txt

@@ -77,6 +77,7 @@ lanscape/ui/templates/scan/ip-table.html
 lanscape/ui/templates/scan/overview.html
 lanscape/ui/templates/scan/scan-error.html
 tests/test_api.py
+tests/test_decorators.py
 tests/test_env.py
 tests/test_library.py
 tests/test_logging.py

{lanscape-1.3.8b1 → lanscape-1.4.0}/pyproject.toml

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

lanscape-1.4.0/tests/test_decorators.py

@@ -0,0 +1,29 @@
+"""Tests for helper decorators used throughout the project."""
+
+import logging
+
+from lanscape.libraries.decorators import run_once
+
+
+def test_run_once_caches_result_and_logs_once(caplog):
+    """run_once should execute only one time and cache the return value."""
+
+    caplog.set_level(logging.DEBUG)
+
+    call_count = {"count": 0}
+
+    @run_once
+    def sample_function(value):
+        call_count["count"] += 1
+        return value * 2
+
+    first = sample_function(3)
+    second = sample_function(5)
+
+    assert first == 6
+    assert second == 6
+    assert call_count["count"] == 1
+
+    messages = [record.message for record in caplog.records]
+    assert any("run_once executed" in record and "sample_function" in record for record in messages)
+    assert sum("run_once executed" in record for record in messages) == 1

lanscape-1.3.8b1/lanscape/ui/templates/scan/config.html

@@ -1,229 +0,0 @@
-<div class="modal fade" id="advanced-modal" tabindex="-1" aria-hidden="true">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header border-secondary">
-        <h5 class="modal-title" id="advanced-modalLabel">Advanced Settings</h5>
-        <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal" aria-label="Close"></button>
-      </div>
-      <div class="modal-body">
-        <div class="d-flex gap-2 mb-3">
-            <div class="config-option p-3 flex-fill flex-wrap" id="config-fast" data-config="fast" onclick="setScanConfig('fast')">
-                <h5 class="mb-1 d-flex align-items-center justify-content-center">
-                    <span class="material-symbols-outlined me-1">bolt</span>Fast
-                </h5>
-                <p class="mb-0">Fast scan, Low accuracy</p>
-            </div>
-            <div class="config-option p-3 flex-fill" id="config-balanced" data-config="balanced" onclick="setScanConfig('balanced')">
-                <h5 class="mb-1 d-flex align-items-center justify-content-center">
-                    <span class="material-symbols-outlined me-1">balance</span>Balanced
-                </h5>
-                <p class="mb-0">Balanced scan, Moderate accuracy</p>
-            </div>
-            <div class="config-option p-3 flex-fill" id="config-accurate" data-config="accurate" onclick="setScanConfig('accurate')">
-                <h5 class="mb-1 d-flex align-items-center justify-content-center">
-                    <span class="material-symbols-outlined me-1">target</span>Accurate
-                </h5>
-                <p class="mb-0">Thorough scan, High accuracy</p>
-            </div>
-        </div>
-
-        <hr>
-        <div class="form-group mt-2">
-            <h6>Device Detection</h6>
-            <div class="row mt-2">
-                <div class="col">
-                    <label class="mb-1">Lookup Type</label>
-                    <div id="lookup-type-group" class="d-flex flex-wrap gap-3">
-                        <div class="form-check">
-                            <input class="form-check-input lookup-type-input" type="checkbox" id="lookup_icmp" value="ICMP">
-                            <label class="form-check-label" for="lookup_icmp">ICMP</label>
-                        </div>
-                        <div class="form-check">
-                            <!-- ARP lookup does not always work. Depends on host system -->
-                            <input 
-                            class="form-check-input lookup-type-input" 
-                            type="checkbox" 
-                            id="lookup_arp_lookup" 
-                            value="ARP_LOOKUP" 
-                            {{ '' if is_arp_supported else 'disabled' }}
-                            />
-                            <label class="form-check-label" for="lookup_arp_lookup">
-                                ARP Lookup
-                            </label>
-                            {% if not is_arp_supported %}
-                                <span 
-                                    class="material-symbols-outlined arp-help-ico" 
-                                    data-bs-toggle="tooltip" 
-                                    data-bs-placement="top" 
-                                    title="ARP lookup is not supported on this system, click for more info"
-                                    onclick="window.open('https://github.com/mdennis281/LANscape/blob/main/support/arp-issues.md', '_blank')"
-                                >
-                                    help
-                                </span>
-                            {% endif %}
-                        </div>
-                        <div class="form-check">
-                            <input class="form-check-input lookup-type-input" type="checkbox" id="lookup_icmp_then_arp" value="ICMP_THEN_ARP">
-                            <label class="form-check-label" for="lookup_icmp_then_arp">ICMP then ARP Cache</label>
-                        </div>
-                        <div class="form-check">
-                            <input class="form-check-input lookup-type-input" type="checkbox" id="lookup_poke_then_arp" value="POKE_THEN_ARP">
-                            <label class="form-check-label" for="lookup_poke_then_arp">Poke then ARP Cache</label>
-                        </div>
-                    </div>
-                    
-                </div>
-                <div class="col">
-                    <label for="t_cnt_isalive">Device Lookup Threads</label>
-                    <input type="number" id="t_cnt_isalive" class="form-control">
-                </div>
-            </div>
-        </div>
-
-        <hr>
-        <div id="section-ping" class="form-group mt-2">
-            <h6>Device Detection <span class=text-color>/</span> Ping Settings</h6>
-            <div class="row">
-                <div class="col-3">
-                    <label for="ping_attempts" class="form-label">Ping Attempts</label>
-                    <input type="number" id="ping_attempts" class="form-control">
-                </div>
-                <div class="col-1 descriptor">X</div>
-                <div class="col-3">
-                    <label for="ping_ping_count" class="form-label">Ping Count</label>
-                    <input type="number" id="ping_ping_count" class="form-control">
-                </div>
-                <div class="col-1 descriptor">=</div>
-                <div class="col-3">
-                    <label for="total-ping-attempts">Max pings per device</label>
-                    <input type="number" id="total-ping-attempts" class="form-control" readonly>
-                </div>
-            </div>
-            <div class="row mt-2">
-                <div class="col">
-                    <label for="ping_timeout" class="form-label">Timeout Per Ping (sec)</label>
-                    <input type="number" step="0.1" id="ping_timeout" class="form-control">
-                </div>
-                <div class="col">
-                    <label for="ping_retry_delay" class="form-label">Delay Between Attempts (sec)</label>
-                    <input type="number" step="0.1" id="ping_retry_delay" class="form-control">
-                </div>
-            </div>
-        </div>
-
-        <hr>
-        <div id="section-arp" class="form-group mt-2">
-            <h6>Device Detection <span class=text-color>/</span> ARP Settings</h6>
-            <div class="row">
-                <div class="col">
-                    <label for="arp_attempts" class="form-label">Attempts</label>
-                    <input type="number" id="arp_attempts" class="form-control">
-                </div>
-                <div class="col">
-                    <label for="arp_timeout" class="form-label">Timeout</label>
-                    <input type="number" step="0.1" id="arp_timeout" class="form-control">
-                </div>
-            </div>
-        </div>
-
-        <hr>
-        <div id="section-arp-cache" class="form-group mt-2 div-hide">
-            <h6>Device Detection <span class=text-color>/</span> ARP Cache Settings</h6>
-            <div class="row">
-                <div class="col">
-                    <label for="arp_cache_attempts" class="form-label">Attempts</label>
-                    <input type="number" id="arp_cache_attempts" class="form-control">
-                </div>
-                <div class="col">
-                    <label for="arp_cache_wait_before" class="form-label">Wait Before (sec)</label>
-                    <input type="number" step="0.1" id="arp_cache_wait_before" class="form-control">
-                </div>
-            </div>
-        </div>
-
-        <hr>
-        <div id="section-poke" class="form-group mt-2 div-hide">
-            <h6>Device Detection <span class=text-color>/</span> Poke Settings</h6>
-            <div class="row">
-                <div class="col">
-                    <label for="poke_attempts" class="form-label">Attempts</label>
-                    <input type="number" id="poke_attempts" class="form-control">
-                </div>
-                <div class="col">
-                    <label for="poke_timeout" class="form-label">Timeout (sec)</label>
-                    <input type="number" step="0.1" id="poke_timeout" class="form-control">
-                </div>
-            </div>
-        </div>
-
-        <hr>
-
-        <div class="form-group mt-2">
-            <h6>Port Testing</h6>
-            <div class="row">
-                <div class="col-3">
-                    <label for="t_cnt_port_scan">Device Scan Threads</label>
-                    <input type="number" id="t_cnt_port_scan" class="form-control">
-                </div>
-                <div class="col-1 descriptor">X</div>
-                <div class="col-3">
-                    <label for="t_cnt_port_test">Port Test Threads</label>
-                    <input type="number" id="t_cnt_port_test" class="form-control">
-                </div>
-                <div class="col-1 descriptor">=</div>
-                <div class="col-3">
-                    <label for="total-port-tests">Total concurrent tests</label>
-                    <input type="number" id="total-port-tests" class="form-control" readonly>
-                </div>
-            </div>
-            <div class="row mt-2">
-                <div class="col">
-                    <label for="port_list">Port List</label>
-                    <div class="port-list-wrapper">
-                        <select id="port_list" class="port-list">
-                            <option value="both">ARP + Ping</option>
-                            <option value="arp">ARP Only</option>
-                            <option value="ping">Ping Only</option>
-                        </select>
-                    </div>
-                </div>
-            </div>
-        <hr>
-
-        <div class="form-group mt-2">
-            <h6>Stages</h6>
-            <div class="form-check" 
-                data-bs-toggle="tooltip"
-                data-bs-placement="right"
-                title="Find Devices using ARP or Ping (always on)"
-            >
-                <input class="form-check-input" disabled type="checkbox" id="task_find_devices" checked>
-                <label class="form-check-label" for="task_find_devices">Find Devices</label>
-            </div>
-            <div class="form-check" 
-                data-bs-toggle="tooltip"
-                data-bs-placement="right"
-                title="Find open ports on devices"
-            >
-                <input class="form-check-input" type="checkbox" id="task_scan_ports">
-                <label class="form-check-label" for="task_scan_ports">Scan Ports</label>
-            </div>
-            <div class="form-check" 
-                data-bs-toggle="tooltip"
-                data-bs-placement="right"
-                title="Determine services running on open ports (no supporting UI yet)"
-            >
-                <input class="form-check-input" type="checkbox" id="task_scan_port_services">
-                <label class="form-check-label" for="task_scan_port_services">Scan Port Services</label>
-            </div>
-        </div>
-
-        </div>
-
-      </div>
-      <div class="modal-footer border-secondary">
-        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-      </div>
-    </div>
-  </div>
-</div>