lanscape 1.4.4__py3-none-any.whl → 2.0.0a1__py3-none-any.whl

lanscape/ui/app.py

@@ -8,12 +8,12 @@ import logging
 from flask import Flask, render_template
 from lanscape.ui.blueprints.web import web_bp, routes  # pylint: disable=unused-import
 from lanscape.ui.blueprints.api import api_bp, tools, port, scan  # pylint: disable=unused-import
-from lanscape.libraries.runtime_args import RuntimeArgs, parse_args
-from lanscape.libraries.version_manager import (
+from lanscape.core.runtime_args import RuntimeArgs, parse_args
+from lanscape.core.version_manager import (
     is_update_available, get_installed_version, lookup_latest_version
 )
-from lanscape.libraries.app_scope import is_local_run
-from lanscape.libraries.net_tools import is_arp_supported
+from lanscape.core.app_scope import is_local_run
+from lanscape.core.net_tools import is_arp_supported
 from lanscape.ui.shutdown_handler import FlaskShutdownHandler
 
 app = Flask(
@@ -122,3 +122,4 @@ def start_webserver(args: RuntimeArgs) -> int:
         'use_reloader': args.reloader
     }
     app.run(**run_args)
+

lanscape/ui/blueprints/__init__.py

@@ -1,10 +1,11 @@
 """Source for all things blueprint related in LANscape UI"""
 import logging
 
-from lanscape.libraries.subnet_scan import ScanManager
+from lanscape.core.subnet_scan import ScanManager
 
 # defining here so blueprints can access the same
 # manager instance
 scan_manager = ScanManager()
 
 log = logging.getLogger('Blueprints')
+

lanscape/ui/blueprints/api/__init__.py

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

lanscape/ui/blueprints/api/port.py

@@ -4,7 +4,7 @@ Provides CRUD operations for managing port lists used in network scans.
 """
 from flask import request, jsonify
 from lanscape.ui.blueprints.api import api_bp
-from lanscape.libraries.port_manager import PortManager
+from lanscape.core.port_manager import PortManager
 
 # Port Manager API
 ############################################
@@ -77,3 +77,4 @@ def delete_port_list(port_list):
         JSON response indicating success or failure
     """
     return jsonify(PortManager().delete_port_list(port_list))
+

lanscape/ui/blueprints/api/scan.py

@@ -9,7 +9,7 @@ import traceback
 from flask import request, jsonify
 
 from lanscape.ui.blueprints.api import api_bp
-from lanscape.libraries.subnet_scan import ScanConfig
+from lanscape.core.subnet_scan import ScanConfig
 from lanscape.ui.blueprints import scan_manager
 
 # Subnet Scanner API
@@ -121,3 +121,4 @@ def get_scan_config():
     """
     data = request.get_json()
     return ScanConfig.from_dict(data)
+

lanscape/ui/blueprints/api/tools.py

@@ -5,10 +5,10 @@ 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, 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
+from lanscape.core.net_tools import get_all_network_subnets, is_arp_supported
+from lanscape.core.ip_parser import parse_ip_input
+from lanscape.core.errors import SubnetTooLargeError
+from lanscape.core.scan_config import DEFAULT_CONFIGS
 
 
 @api_bp.route('/api/tools/subnet/test')
@@ -69,3 +69,4 @@ def get_default_configs():
         configs[key] = config_dict
 
     return jsonify(configs)
+

lanscape/ui/blueprints/web/__init__.py

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

lanscape/ui/blueprints/web/routes.py

@@ -2,9 +2,9 @@
 Web blueprint routes for the LANscape application.
 Handles UI views including the main dashboard, scan results, error display, and exports.
 """
-from flask import render_template, request, redirect
+from flask import render_template, request, redirect, url_for
 from lanscape.ui.blueprints.web import web_bp
-from lanscape.libraries.net_tools import (
+from lanscape.core.net_tools import (
     get_all_network_subnets,
     smart_select_primary_subnet
 )
@@ -81,6 +81,33 @@ def view_errors(scan_id):
     return redirect('/')
 
 
+@web_bp.route('/device/<scan_id>/<device_ip>')
+def view_device(scan_id, device_ip):
+    """
+    Display detailed information about a specific device from a scan.
+
+    Args:
+        scan_id: Unique identifier for the scan
+        device_ip: IP address of the device to view
+
+    Returns:
+        Rendered device detail template or redirect to home if scan not found
+    """
+    if scanner := scan_manager.get_scan(scan_id):
+        devices = scanner.results.devices
+        device_info = next(
+            (device for device in devices if getattr(
+                device, 'ip', None) == device_ip), None)
+
+        if device_info:
+            return render_template('scan/device-detail.html', device=device_info, scan_id=scan_id)
+
+        log.debug(f'Device {device_ip} not found in scan {scan_id}')
+        return redirect(url_for('render_scan', scan_id=scan_id))
+    log.debug(f'Redirecting, scan {scan_id} doesnt exist in memory')
+    return redirect('/')
+
+
 @web_bp.route('/export/<scan_id>')
 def export_scan(scan_id):
     """
@@ -123,3 +150,4 @@ def app_info():
         Rendered info template
     """
     return render_template('info.html')
+

lanscape/ui/main.py

@@ -9,10 +9,10 @@ import traceback
 import os
 import requests
 
-from lanscape.libraries.logger import configure_logging
-from lanscape.libraries.runtime_args import parse_args
-from lanscape.libraries.web_browser import open_webapp
-from lanscape.libraries.version_manager import get_installed_version, is_update_available
+from lanscape.core.logger import configure_logging
+from lanscape.core.runtime_args import parse_args
+from lanscape.core.web_browser import open_webapp
+from lanscape.core.version_manager import get_installed_version, is_update_available
 from lanscape.ui.app import start_webserver_daemon, start_webserver
 # do this so any logs generated on import are displayed
 args = parse_args()
@@ -136,3 +136,4 @@ def terminate():
 
 if __name__ == "__main__":
     main()
+

lanscape/ui/shutdown_handler.py

@@ -5,7 +5,7 @@ import os
 from flask import request
 
 
-from lanscape.libraries.runtime_args import parse_args
+from lanscape.core.runtime_args import parse_args
 
 
 log = logging.getLogger('shutdown_handler')
@@ -55,3 +55,4 @@ class FlaskShutdownHandler:
         """Exits the application if a shutdown request has been made."""
         if self._exiting:
             os._exit(0)
+

lanscape/ui/static/css/style.css

@@ -555,6 +555,41 @@ input[type="range"] {
     color: var(--text-color);
 }
 
+/* Service Strategy Select Styles */
+.service-strategy-wrapper {
+    position: relative;
+    display: inline-block;
+    width: 60%; /* Narrower than port list */
+}
+
+.service-strategy {
+    position: relative;
+    background-color: var(--secondary-bg);
+    border: 1px solid var(--border-color);
+    color: var(--text-color);
+    padding: 10px;
+    cursor: pointer;
+    width: 100%;
+    height: 42px;
+    user-select: none;
+    appearance: none;  /* Hide default arrow */
+    transition: all .2s ease-in-out;
+}
+
+.service-strategy:focus {
+    border-color: var(--primary-accent-hover);
+    outline: none;
+}
+
+.service-strategy-wrapper::after {
+    content: '▼';
+    position: absolute;
+    top: 10px;
+    right: 10px;
+    pointer-events: none;
+    color: var(--text-color);
+}
+
 
 
 .text-color {
@@ -612,6 +647,35 @@ input[type="range"] {
     background-color: var(--primary-bg-accent);
 }
 
+.table tbody tr td:has(.info-icon-container),
+.table thead tr th.detail-col
+{
+    width: 30px;
+    /*
+    background-color: var(--body-bg);
+    border: 1px solid var(--text-almost-hidden);
+    */
+}
+.table td:has(.info-icon-container) {
+    width: 30px;
+    text-align: center;      /* horizontal center */
+    vertical-align: middle;  /* vertical center inside the cell */
+    padding: 0;              /* optional: remove extra padding */
+}
+.table td .info-icon-container {
+    display: flex;
+    justify-content: center; /* horizontal center */
+    align-items: center;     /* vertical center */
+    height: 100%;            /* ensure it takes full cell height */
+}
+.table td .info-icon-container .info-icon {
+    font-size: 1.2em;
+    color: var(--text-placeholder);
+    cursor: pointer;
+}
+.table td .info-icon:hover {
+    color: var(--text-color);
+}
 
 /* Badge Styles */
 .badge-warning {
@@ -627,7 +691,7 @@ input[type="range"] {
 }
 
 .badge-info {
-    background-color: var(--info-accent);
+    background-color: var(--primary-accent);
 }
 
 .badge-secondary {
@@ -835,4 +899,83 @@ html {
     
 }
 
-/* END overview container */
+/* END overview container */
+
+/* Device Modal Styles */
+#device-modal {
+    --bs-modal-width: 750px;
+}
+#device-modal .modal-content {
+    background-color: var(--primary-bg);
+}
+#device-modal h6 {
+    color: var(--primary-accent);
+}
+
+/* Key/Value grid for overview */
+#device-modal .kv-grid {
+    display: grid;
+    grid-template-columns: 180px 1fr;
+    column-gap: 12px;
+    row-gap: 8px;
+    align-items: center;
+}
+#device-modal .kv-label {
+    color: var(--text-placeholder);
+    text-align: right;
+}
+#device-modal .kv-value {
+    color: var(--text-color);
+}
+
+/* Port/service chips */
+#device-modal .chip-group { margin-top: 4px; }
+#device-modal .chip {
+    display: inline-flex;
+    align-items: center;
+    gap: 4px;
+    padding: 2px 8px;
+    margin: 2px;
+    font-size: .85rem;
+    background-color: var(--primary-bg-accent);
+    border: 1px solid var(--border-color);
+    border-radius: 999px;
+    color: var(--text-color);
+}
+#device-modal .chip .material-symbols-outlined {
+    font-size: 16px;
+}
+
+/* Services layout */
+#device-modal .service-list { width: 100%; }
+#device-modal .service-row {
+    display: flex;
+    align-items: flex-start;
+    gap: 8px;
+    padding: 6px 0;
+    border-bottom: 1px dashed var(--border-color);
+}
+#device-modal .service-row:last-child {
+    border-bottom: none;
+}
+#device-modal .service-name {
+    min-width: 140px;
+    color: var(--text-accent-color);
+    font-weight: 600;
+}
+#device-modal .service-ports { flex: 1; }
+
+/* Errors */
+#device-modal .error-list li {
+    margin-bottom: 4px;
+}
+
+/* Responsive tweaks */
+@media screen and (max-width: 576px) {
+    #device-modal .kv-grid {
+        grid-template-columns: 130px 1fr;
+    }
+    #device-modal .service-name {
+        min-width: 110px;
+    }
+}

lanscape/ui/static/js/main.js

@@ -1,5 +1,3 @@
-
-
 $(document).ready(function() {
     // Load port lists into the dropdown
     const scanId = getActiveScanId();
@@ -217,6 +215,36 @@ $(window).on('resize', function() {
     resizeIframe($('#ip-table-frame')[0]);
 });
 
+function openDeviceDetail(deviceIp) {
+    try {
+        const scanId = getActiveScanId();
+        if (!scanId || !deviceIp) return;
+
+        const safeIp = encodeURIComponent(deviceIp.trim());
+
+        // Remove any existing modal instance to avoid duplicates
+        $('#device-modal').remove();
+
+        $.get(`/device/${scanId}/${safeIp}`, function(html) {
+            // Append modal HTML to the document
+            $('body').append(html);
+
+            // Show the modal
+            const $modal = $('#device-modal');
+            $modal.modal('show');
+
+            // Clean up after closing
+            $modal.on('hidden.bs.modal', function() {
+                $(this).remove();
+            });
+        }).fail(function() {
+            console.error('Failed to load device details');
+        });
+    } catch (e) {
+        console.error('Error opening device detail modal:', e);
+    }
+}
+
 
 
 

lanscape/ui/static/js/scan-config.js

@@ -13,6 +13,7 @@ $(document).ready(function() {
     
     $('#t_cnt_port_scan, #t_cnt_port_test').on('input', updatePortTotals);
     $('#ping_attempts, #ping_ping_count').on('input', updatePingTotals);
+    $('#task_scan_port_services').on('change', updateVisibility);
 
     // Lookup type toggles
     $('.lookup-type-input').on('change', onLookupTypeChanged);
@@ -43,6 +44,30 @@ function setScanConfig(configName) {
     $('#task_scan_ports').prop('checked', config.task_scan_ports);
     $('#task_scan_port_services').prop('checked', config.task_scan_port_services);
 
+    // port scan config
+    if (config.port_scan_config) {
+        $('#port_scan_timeout').val(config.port_scan_config.timeout);
+        $('#port_scan_retries').val(config.port_scan_config.retries);
+        $('#port_scan_retry_delay').val(config.port_scan_config.retry_delay);
+    } else {
+        // defaults if missing
+        $('#port_scan_timeout').val(1.0);
+        $('#port_scan_retries').val(0);
+        $('#port_scan_retry_delay').val(0.1);
+    }
+
+    // service config
+    if (config.service_scan_config) {
+        $('#service_lookup_type').val(config.service_scan_config.lookup_type || 'BASIC');
+        $('#service_timeout').val(config.service_scan_config.timeout);
+        $('#service_max_concurrent_probes').val(config.service_scan_config.max_concurrent_probes);
+    } else {
+        // defaults if missing
+        $('#service_lookup_type').val('BASIC');
+        $('#service_timeout').val(5.0);
+        $('#service_max_concurrent_probes').val(10);
+    }
+
     // lookup type (array of enum values as strings)
     setLookupTypeUI(config.lookup_type || []);
 
@@ -99,6 +124,16 @@ function getScanConfig() {
         poke_config: {
             attempts: parseInt($('#poke_attempts').val()),
             timeout: parseFloat($('#poke_timeout').val())
+        },
+        port_scan_config: {
+            timeout: parseFloat($('#port_scan_timeout').val()),
+            retries: parseInt($('#port_scan_retries').val()),
+            retry_delay: parseFloat($('#port_scan_retry_delay').val())
+        },
+        service_scan_config: {
+            timeout: parseFloat($('#service_timeout').val()),
+            lookup_type: $('#service_lookup_type').val(),
+            max_concurrent_probes: parseInt($('#service_max_concurrent_probes').val())
         }
     };
 }
@@ -168,6 +203,10 @@ function updateVisibility() {
     // Poke section only when POKE_THEN_ARP is selected
     const showPoke = types.has('POKE_THEN_ARP');
     toggleSection('#section-poke', showPoke);
+
+    // Service scan section visible only if stage enabled
+    const showService = $('#task_scan_port_services').is(':checked');
+    toggleSection('#section-service-scan', showService);
 }
 
 function toggleSection(selector, show) {

lanscape/ui/templates/scan/config.html

@@ -181,6 +181,49 @@
                         </div>
                     </div>
                 </div>
+                <div class="row mt-2">
+                    <div class="col">
+                        <label for="port_scan_timeout" class="form-label">Port Timeout (sec)</label>
+                        <input type="number" step="0.1" id="port_scan_timeout" class="form-control">
+                    </div>
+                    <div class="col">
+                        <label for="port_scan_retries" class="form-label">Retries</label>
+                        <input type="number" id="port_scan_retries" class="form-control">
+                    </div>
+                    <div class="col">
+                        <label for="port_scan_retry_delay" class="form-label">Retry Delay (sec)</label>
+                        <input type="number" step="0.1" id="port_scan_retry_delay" class="form-control">
+                    </div>
+                </div>
+            </div>
+
+            <div id="section-service-scan" class="form-group mt-2 config-section div-hide">
+                <h6>Service Scanning</h6>
+                <div class="row">
+                    <div class="col">
+                        <label for="service_lookup_type" class="form-label">Strategy</label>
+                        <div class="service-strategy-wrapper">
+                            <select id="service_lookup_type" class="service-strategy">
+                                <option value="LAZY">Lazy (few probes)</option>
+                                <option value="BASIC">Basic (common probes)</option>
+                                <option value="AGGRESSIVE">Aggressive (all probes)</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="col">
+                        <label for="service_timeout" class="form-label">Timeout (sec)</label>
+                        <input type="number" step="0.1" id="service_timeout" class="form-control">
+                    </div>
+                    <div class="col">
+                        <label for="service_max_concurrent_probes" class="form-label">Max Concurrent Probes</label>
+                        <input type="number" id="service_max_concurrent_probes" class="form-control">
+                    </div>
+                </div>
+                <div class="row mt-1">
+                    <div class="col">
+                        <small class="text-secondary">Attempts service identification on open ports using selected strategy.</small>
+                    </div>
+                </div>
             </div>
 
             <div class="form-group mt-2 config-section">

lanscape/ui/templates/scan/device-detail.html

@@ -0,0 +1,111 @@
+<div class="modal fade" id="device-modal" tabindex="-1" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header border-secondary">
+        {% set ip = device.ip|default('Unknown IP') %}
+        {% set hostname = device.hostname|default('') %}
+        {% set manufacturer = device.manufacturer|default('') %}
+        {% set mac = device.mac_addr|default('') %}
+        {% set stage = device.stage|default('unknown') %}
+        {% set ports = device.ports|default([]) %}
+        {% set services = device.services|default({}) %}
+        {% set errors = device.caught_errors|default([]) %}
+        {% set stage_lower = (stage|string|lower) %}
+        {% set stage_badge_class = 'badge-success' if stage_lower == 'complete' else 'badge-warning' if stage_lower in ['running', 'in_progress'] else 'badge-secondary' %}
+        <h5 class="modal-title" id="device-modalLabel">
+          Device Details
+          <span class="text-secondary small ms-2">IP: {{ ip }}</span>
+        </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="config-sections">
+          <div class="form-group mt-2 config-section">
+            <h6>Overview</h6>
+            <div class="kv-grid mt-1">
+              <div class="kv-label">IP Address</div>
+              <div class="kv-value">{{ ip }}</div>
+
+              <div class="kv-label">Hostname</div>
+              <div class="kv-value">{{ hostname|trim if hostname|default('')|trim else 'Unknown Hostname' }}</div>
+
+              <div class="kv-label">MAC Address</div>
+              <div class="kv-value">{{ mac|trim if mac|default('')|trim else 'Unknown MAC' }}</div>
+
+              <div class="kv-label">Manufacturer</div>
+              <div class="kv-value">{{ manufacturer|trim if manufacturer|default('')|trim else 'Unknown Manufacturer' }}</div>
+
+              <div class="kv-label">Stage</div>
+              <div class="kv-value">
+                <span class="badge {{ stage_badge_class }}">{{ stage|default('unknown')|capitalize }}</span>
+              </div>
+            </div>
+          </div>
+
+          <div class="form-group mt-2 config-section">
+            <h6>Open Ports</h6>
+            {% if ports and ports|length > 0 %}
+              <div class="chip-group mt-1">
+                {% for p in ports %}
+                  <span class="chip" title="Port {{ p }}">
+                    <span class="material-symbols-outlined">lan</span>{{ p }}
+                  </span>
+                {% endfor %}
+              </div>
+            {% else %}
+              <div class="text-secondary">No open ports detected.</div>
+            {% endif %}
+          </div>
+
+          <div class="form-group mt-2 config-section">
+            <h6>Services</h6>
+            {% if services and services|length > 0 %}
+              <div class="service-list mt-1">
+                {% for svc, svc_ports in services|dictsort %}
+                  <div class="service-row">
+                    <div class="service-name">
+                      <span class="material-symbols-outlined align-middle me-1">dns</span>{{ svc|default('Unknown') }}
+                    </div>
+                    <div class="service-ports">
+                      {% set s_ports = svc_ports|default([]) %}
+                      {% if s_ports and s_ports|length > 0 %}
+                        {% for sp in s_ports %}
+                          <span class="chip" title="{{ svc }} on {{ ip }}:{{ sp }}">{{ sp }}</span>
+                        {% endfor %}
+                      {% else %}
+                        <span class="text-secondary">No ports</span>
+                      {% endif %}
+                    </div>
+                  </div>
+                {% endfor %}
+              </div>
+            {% else %}
+              <div class="text-secondary">No service information available.</div>
+            {% endif %}
+          </div>
+
+          <div class="form-group mt-2 config-section">
+            <h6>Errors</h6>
+            {% if errors and errors|length > 0 %}
+              <ul class="list-unstyled error-list mt-1">
+                {% for err in errors %}
+                  <li class="text-danger">
+                    <span class="material-symbols-outlined align-middle me-1">error</span>
+                    {{ err }}
+                  </li>
+                {% endfor %}
+              </ul>
+            {% else %}
+              <div class="text-secondary">No errors captured.</div>
+            {% endif %}
+          </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>