lanscape 1.3.4__py3-none-any.whl → 1.3.5a1__py3-none-any.whl

lanscape/ui/static/css/style.css

@@ -117,6 +117,7 @@ hr {
 }
 h1.title{
     cursor: pointer;
+    margin: 0;
 }
 .title span {
     color: var(--text-accent-color);
@@ -163,18 +164,21 @@ details {
     border-radius: 5px !important; /* override bootstrap stuff */
     padding-right: 34px;
     margin-right: -34px;
+    margin-left: -41px;
+    padding-left: calc(41px + 5px);
 }
 
 
 #scan-form .input-group button {
     background-color: var(--primary-bg-accent);
     border: 0;
-    border-left: 1px var(--border-color) solid;
+    
     transition: all .2s ease-in-out;
     height: 40px;
-    border-radius: 0 5px 5px 0;
     margin-top: 1px;
     transform: translateX(.5px);
+    z-index: 3;
+    margin-left: 0;
 }
 #scan-form .input-group button:hover {
     background-color: var(--primary-bg-accent-hover);
@@ -182,6 +186,15 @@ details {
 #scan-form .input-group button:active {
     background-color: var(--primary-accent);
 }
+#scan-form .input-group button.start {
+    border-radius: 5px 0 0 5px;
+    border-right: 1px var(--border-color) solid;
+    width: 40px; /* added because it looks gross on icon load */
+}
+#scan-form .input-group button.end {
+    border-radius: 0 5px 5px 0;
+    border-left: 1px var(--border-color) solid;
+}
 
 .label-container {
     display: flex;
@@ -256,8 +269,69 @@ details {
     }
 }
 
+#advanced-modal {
+    --bs-modal-width: 750px;
+}
+#advanced-modal .modal-content {
+    background-color: var(--primary-bg);
+}
+#advanced-modal .descriptor {
+    align-content: end;
+    text-align: center;
+    color: var(--text-placeholder);
+    padding-bottom: 10px;
+}
+#advanced-modal .col-2-percent {
+    flex: 0 0 auto;
+    width: 2%;
+}
+#advanced-modal label {
+    font-size: 12px;
+}
+#advanced-modal .form-check {
+    width: fit-content;
+}
+#advanced-modal h6 {
+    color: var(--primary-accent);
+}
+#advanced-modal .config-option {
+    background-color: var(--primary-bg-accent);
+    border: 1px solid var(--border-color);
+    border-radius: 5px;
+    cursor: pointer;
+    text-align: center;
+    margin: 0 5px;
+    transition: all .2s ease-in-out;
+}
 
-
+#advanced-modal .config-option.active {
+    border-color: var(--primary-accent);
+    box-shadow: 0 0 5px var(--primary-accent);
+    background-color: var(--primary-bg);
+}
+#advanced-modal .config-option:hover {
+    background-color: var(--primary-bg);
+    box-shadow: 0 0 5px var(--primary-accent);
+}
+#advanced-modal .config-option.active:hover {
+    background-color: var(--primary-bg-accent);
+    box-shadow: 0 0 5px var(--primary-accent);
+}
+#advanced-modal .config-option h5 {
+    flex-wrap: wrap;
+}
+#advanced-modal .config-option h5 span {
+    display: block; /* "waaaah span shouldnt be block" bite me. */
+    width: 100%;
+    padding: 5px;
+    font-size: 2em;
+}
+#advanced-modal .config-option p {
+    font-size: 0.8em;
+    color: var(--text-placeholder);
+    margin: 0;
+    padding: 5px;
+}
 
 
 /* Card Styles */
@@ -286,7 +360,7 @@ form {
     flex-grow: 1;
     display: flex;
     flex-direction: column;
-    margin-bottom: 15px;
+    margin-bottom: 5px;
 }
 
 label {
@@ -310,6 +384,12 @@ input[type="text"]:focus, select:focus, .form-control:focus {
     border-color: var(--primary-accent);
     outline: none;
 }
+input[type="text"]:read-only, .form-control:read-only {
+    background-color: var(--secondary-bg);
+    color: var(--text-placeholder);
+    border-color: var(--secondary-accent);
+    outline: none;
+}
 
 input::placeholder {
     color: var(--text-placeholder) !important;
@@ -326,6 +406,7 @@ button {
 #scan-form #scan-submit {
     border: none;
     padding: 10px 20px;
+    margin-top: 15px;
 }
 
 /* Button Styling */
@@ -378,20 +459,6 @@ input[type="range"] {
     margin: 5px 0;
 }
 
-input[type="range"]::-webkit-slider-thumb,
-input[type="range"]::-moz-range-thumb {
-    -webkit-appearance: none;
-    appearance: none;
-    width: 16px;
-    height: 16px;
-    border-radius: 50%;
-    background: var(--primary-accent);
-    cursor: pointer;
-}
-#parallelism-value span {
-    color: var(--text-danger-color);
-    font-weight: 500;
-}
 .port-list-wrapper {
     position: relative;
     display: inline-block;
@@ -400,12 +467,13 @@ input[type="range"]::-moz-range-thumb {
 
 .port-list {
     position: relative;
-    background-color: var(--body-bg);
+    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;
@@ -419,7 +487,7 @@ input[type="range"]::-moz-range-thumb {
 .port-list-wrapper::after {
     content: '▼';
     position: absolute;
-    top: 14px;
+    top: 10px;
     right: 10px;
     pointer-events: none;
     color: var(--text-color);
@@ -451,6 +519,12 @@ input[type="range"]::-moz-range-thumb {
     color: var(--text-color);
 }
 
+
+
+.text-color {
+    color: var(--text-color) !important;
+}
+
 .text-secondary {
     color: var(--secondary-accent) !important;
 }

lanscape/ui/static/js/main.js

@@ -2,21 +2,15 @@
 
 $(document).ready(function() {
     // Load port lists into the dropdown
-    getPortLists();
-    
-    $('#parallelism').on('input', function() {
-        const val = $('#parallelism').val();
-        let ans = val;
-
-        if (parseFloat(val) > 1) {
-            ans += ' <span>Warning: Increased parallelism may have inaccurate results<span>'
-        }
-        $('#parallelism-value').html(ans);
-    });
     const scanId = getActiveScanId();
     if (scanId) {
         showScan(scanId);
     }
+
+    // this prevents the browser from
+    // triggering the shutdown beacon
+    // when user clicks the logo
+    setUrlParam('loaded', 'true')
     
 
     // Handle form submission
@@ -39,18 +33,19 @@ $(document).ready(function() {
         $('#ip-table-frame').attr('src', newSrc);
     });
 
+    $('#settings-btn').on('click', function() {
+        $('#advanced-modal').modal('show');
+    });
+
 });
 
 function submitNewScan() {
-    const formData = {
-        subnet: $('#subnet').val(),
-        port_list: $('#port-list').text(),
-        parallelism: $('#parallelism').val()
-    };
+    const config = getScanConfig();
+    config.subnet = $('#subnet').val();
     $.ajax('/api/scan', {
-        data : JSON.stringify(formData),
-        contentType : 'application/json',
-        type : 'POST',
+        data: JSON.stringify(config),
+        contentType: 'application/json',
+        type: 'POST',
         success: function(response) {
             if (response.status === 'running') {
                 showScan(response.scan_id);
@@ -75,37 +70,9 @@ function showScan(scanId) {
     //$('#overview-frame').attr('src', '/scan/' + scanId + '/overview');
     $('#ip-table-frame').attr('src', '/scan/' + scanId + '/table');
     
-    // set url query string 'scan_id' to the scan_id
-    const url = new URL(window.location.href);
-    url.searchParams.set('scan_id', scanId);
-    // set url to the new url
-    window.history.pushState({}, '', url);
+    setUrlParam('scan_id', scanId);
 }
 
-function getPortLists() {
-    $.get('/api/port/list', function(data) {
-        const customSelect = $('#port-list');
-        const customSelectDropdown = $('#port-list-dropdown');
-        customSelectDropdown.empty();
-    
-        // Populate the dropdown with the options
-        data.forEach(function(portList) {
-            customSelectDropdown.append('<div>' + portList + '</div>');
-        });
-    
-        // Handle dropdown click
-        customSelect.on('click', function() {
-            customSelectDropdown.toggleClass('open');
-        });
-    
-        // Handle option selection
-        customSelectDropdown.on('click', 'div', function() {
-            const selectedOption = $(this).text();
-            customSelect.text(selectedOption);
-            customSelectDropdown.removeClass('open');
-        });
-    });
-}
 
 $(document).on('click', function(event) {
     if (!$(event.target).closest('.port-list-wrapper').length) {
@@ -234,6 +201,16 @@ $('#ip-table-frame').on('load', function() {
     observeIframeContent(this); // Start observing for dynamic changes
 });
 
+function setUrlParam(param, value) {
+    const url = new URL(window.location.href);
+    if (value === null || value === undefined) {
+        url.searchParams.delete(param);
+    } else {
+        url.searchParams.set(param, value);
+    }
+    window.history.pushState({}, '', url);
+}
+
 
 
 $(window).on('resize', function() {

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

@@ -0,0 +1,107 @@
+let defaultScanConfigs = {};
+let activeConfigName = 'balanced';
+
+$(document).ready(function() {
+    // load port lists
+    getPortLists(function() {
+        // THEN get scan config defaults
+        getScanDefaults(function() {
+            // THEN set the default scan config
+            setScanConfig('balanced');
+        })
+    });
+    
+    $('#t_cnt_port_scan, #t_cnt_port_test').on('input', updatePortTotals);
+    $('#ping_attempts, #ping_ping_count').on('input', updatePingTotals);
+});
+
+function getScanDefaults(callback=null) {
+    $.getJSON('/api/tools/config/defaults', (data) => {
+        defaultScanConfigs = data;
+        if (callback) callback();
+    });
+}
+
+function setScanConfig(configName) {
+    const config = defaultScanConfigs[configName];
+    if (!config) return;
+    activeConfigName = configName;
+
+    // highlight selected preset
+    $('.config-option').removeClass('active');
+    $(`#config-${configName}`).addClass('active');
+
+    // basic settings
+    $('#port_list').val(config.port_list);
+    $('#t_multiplier').val(config.t_multiplier);
+    $('#t_cnt_port_scan').val(config.t_cnt_port_scan);
+    $('#t_cnt_port_test').val(config.t_cnt_port_test);
+    $('#t_cnt_isalive').val(config.t_cnt_isalive);
+    $('#task_scan_ports').prop('checked', config.task_scan_ports);
+    $('#task_scan_port_services').prop('checked', config.task_scan_port_services);
+    $('#lookup_type').val(config.lookup_type);
+
+    // ping config
+    $('#ping_attempts').val(config.ping_config.attempts);
+    $('#ping_ping_count').val(config.ping_config.ping_count);
+    $('#ping_retry_delay').val(config.ping_config.retry_delay);
+    $('#ping_timeout').val(config.ping_config.timeout);
+
+    // arp config
+    $('#arp_attempts').val(config.arp_config.attempts);
+    $('#arp_timeout').val(config.arp_config.timeout);
+
+    updatePortTotals();
+    updatePingTotals();
+}
+
+function getScanConfig() {
+    return {
+        port_list: $('#port_list').val(),
+        t_cnt_port_scan: parseInt($('#t_cnt_port_scan').val()),
+        t_cnt_port_test: parseInt($('#t_cnt_port_test').val()),
+        t_cnt_isalive: parseInt($('#t_cnt_isalive').val()),
+        task_scan_ports: $('#task_scan_ports').is(':checked'),
+        task_scan_port_services: $('#task_scan_port_services').is(':checked'),
+        lookup_type: $('#lookup_type').val(),
+        ping_config: {
+            attempts: parseInt($('#ping_attempts').val()),
+            ping_count: parseInt($('#ping_ping_count').val()),
+            retry_delay: parseFloat($('#ping_retry_delay').val()),
+            timeout: parseFloat($('#ping_timeout').val())
+        },
+        arp_config: {
+            attempts: parseInt($('#arp_attempts').val()),
+            timeout: parseFloat($('#arp_timeout').val())
+        }
+    };
+}
+
+function getPortLists(callback=null) {
+    $.get('/api/port/list', function(data) {
+        const customSelectDropdown = $('#port_list');
+        customSelectDropdown.empty();
+    
+        // Populate the dropdown with the options
+        data.forEach(function(portList) {
+            customSelectDropdown.append('<option>' + portList + '</option>');
+        });
+        if (callback) callback();
+    });
+}
+
+function updatePortTotals() {
+    const scan = parseInt($('#t_cnt_port_scan').val()) || 0;
+    const test = parseInt($('#t_cnt_port_test').val()) || 0;
+    $('#total-port-tests').val(scan * test);
+}
+
+function updatePingTotals() {
+    const attempts = parseInt($('#ping_attempts').val()) || 0;
+    const count = parseInt($('#ping_ping_count').val()) || 0;
+    $('#total-ping-attempts').val(attempts * count);
+}
+
+// expose functions globally
+window.setScanConfig = setScanConfig;
+window.getScanConfig = getScanConfig;

lanscape/ui/static/lanscape.webmanifest

@@ -13,7 +13,8 @@
         "type": "image/png"
       }
     ],
-    "theme_color": "#0856a9",
-    "background_color": "#1e1e1e",
-    "display": "standalone"
+    "theme_color": "#0a84ff",
+    "background_color": "#262626",
+    "display": "minimal-ui"
+    
   }

lanscape/ui/templates/main.html

@@ -3,52 +3,54 @@
 {% block content %}
 <div id="header">
       <!-- Header and Scan Submission Inline -->
-    <div class="d-flex justify-content-between align-items-center flex-wrap">
+    <div class="d-flex justify-content-between align-items-center flex-nowrap">
         <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">
-                <div class="label-container">
-                    <label for="subnet">Subnet:</label>
-                    <div id="subnet-info"></div>
+        <!-- Right side: settings + form -->
+        <div class="d-flex align-items-center justify-content-end ms-auto">
+            <form id="scan-form" class="d-flex align-items-center">
+                <div class="form-group me-2">
+                    <!-- Above subnet input -->
+                    <div class="label-container">
+                        <label for="subnet">Subnet:</label>
+                        <div id="subnet-info"></div>
+                    </div>
+                    <!-- Subnet input with dropdown -->
+                    <div class="input-group">
+                        <button
+                            type="button"
+                            id="settings-btn"
+                            class="btn btn-secondary start material-symbols-outlined"
+                            data-bs-toggle="tooltip"
+                            data-bs-placement="bottom"
+                            title="Advanced scan settings"
+                        >
+                            settings
+                        </button>
+                        <input type="text" id="subnet" name="subnet" class="form-control" value="{{ subnet }}" placeholder="Enter subnet">
+                        <button class="btn btn-secondary dropdown-toggle end" type="button" id="subnet-dropdown" data-bs-toggle="dropdown" aria-expanded="false"></button>
+                        <ul class="dropdown-menu" aria-labelledby="subnet-dropdown" id="dropdown-list">
+                            {% for subnet_option in alternate_subnets %}
+                            <li><a class="dropdown-item" href="#">{{ subnet_option['subnet'] }}</a></li>
+                            {% endfor %}
+                        </ul>
+                    </div>
                 </div>
-                <div class="input-group">
-                    <input type="text" id="subnet" name="subnet" class="form-control" value="{{ subnet }}" placeholder="Enter subnet">
-                    <button class="btn btn-secondary dropdown-toggle" type="button" id="subnet-dropdown" data-bs-toggle="dropdown" aria-expanded="false"></button>
-                    <ul class="dropdown-menu" aria-labelledby="subnet-dropdown" id="dropdown-list">
-                        {% for subnet_option in alternate_subnets %}
-                        <li><a class="dropdown-item" href="#">{{ subnet_option['subnet'] }}</a></li>
-                        {% endfor %}
-                    </ul>
-                </div>
-            </div>
-            <button type="submit" id="scan-submit" class="btn btn-primary mb-3">Scan</button>
-        </form>
+                <button type="submit" id="scan-submit" class="btn btn-primary">Scan</button>
+            </form>
+        </div>
     </div>
 
-    <!-- Advanced Section -->
-    <details onclick="rightSizeDocLayout()">
-        <summary>Advanced</summary>
-        <div class="form-group mt-2">
-            <label for="port_list">Port List:</label>
-            <div class="port-list-wrapper">
-                <div id="port-list" class="port-list">{{port_list}}</div>
-                <div id="port-list-dropdown" class="port-list-dropdown"></div>
-            </div>
-        </div>
-        
-        <div class="form-group mt-2">
-            <label for="parallelism">Parallelism:</label>
-            <input type="range" id="parallelism" name="parallelism" min="0.25" max="3" step="0.05" value="{{parallelism}}">
-            <output id="parallelism-value">{{parallelism}}</output>
-        </div>
-    </details>
     <div id="scan-progress-bar"></div>
 </div>
+
+<!-- Advanced Settings Modal -->
+{% include 'scan/config.html' %}
+
+
 <div id="content">
     <div class="container-fluid my-4">
         <!-- ARP Error -->
@@ -92,6 +94,7 @@
 <script src="{{ url_for('static', filename='js/main.js') }}"></script>
 <script src="{{ url_for('static', filename='js/subnet-info.js') }}"></script>
 <script src="{{ url_for('static', filename='js/subnet-selector.js') }}"></script>
+<script src="{{ url_for('static', filename='js/scan-config.js') }}"></script>
 {% endblock %}