From 5e76b92b965443af7f42bded50bc681491d2f533 Mon Sep 17 00:00:00 2001
From: adrien <adrien@malingrey.fr>
Date: Wed, 16 Oct 2024 20:08:49 +0200
Subject: [PATCH] targets no longer required

---
 config.php        |  4 +++-
 filter_inputs.php |  9 +++++----
 hostScan.xsl      | 26 ++++++++++++++------------
 index.php         | 24 +++++++++++++-----------
 lanScan.xsl       | 26 ++++++++++++++------------
 options.php       |  4 ++--
 scan.php          |  7 -------
 7 files changed, 51 insertions(+), 49 deletions(-)

diff --git a/config.php b/config.php
index 3a4bf70..4bb24d8 100644
--- a/config.php
+++ b/config.php
@@ -17,6 +17,8 @@ $HOSTSCAN_OPTIONS = [
     'stylesheet' => "$BASEDIR/hostScan.xsl"
 ];
 
+$refreshPeriod = 60;
+$sudo          = true;
+
 $SCANSDIR = 'scans';
 $DATADIR  = '/usr/share/nmap';
-
diff --git a/filter_inputs.php b/filter_inputs.php
index 42cfda4..0cd379c 100644
--- a/filter_inputs.php
+++ b/filter_inputs.php
@@ -12,10 +12,6 @@ $fileNameRegex           = '/^[^<>:"\/|?]+$/';
 $targets       = filter_input(INPUT_GET, 'targets', FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => $targetsListRegex], "flags" => FILTER_NULL_ON_FAILURE]);
 $lan           = filter_input(INPUT_GET, 'lan', FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => $targetsListRegex], "flags" => FILTER_NULL_ON_FAILURE]);
 $host          = filter_input(INPUT_GET, 'host', FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => $targetsListRegex], "flags" => FILTER_NULL_ON_FAILURE]);
-$saveAs        = filter_input(INPUT_GET, 'saveAs', FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => $fileNameRegex]]);
-$compareWith   = filter_input(INPUT_GET, 'compareWith', FILTER_VALIDATE_URL);
-$refreshPeriod = filter_input(INPUT_GET, 'refreshPeriod', FILTER_VALIDATE_INT, ['options' => ['min_range' => 0]]);
-$sudo          = filter_input(INPUT_GET, 'sudo', FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE);
 
 if ($lan) {
   $targets = $lan;
@@ -116,4 +112,9 @@ if ($lan) {
     'h'            => FILTER_VALIDATE_BOOLEAN,
     'stylesheet'   => FILTER_VALIDATE_URL,
   ], false) ?: $LANSCAN_OPTIONS;
+  
+  $saveAs        = filter_input(INPUT_GET, 'saveAs', FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => $fileNameRegex]]);
+  $compareWith   = filter_input(INPUT_GET, 'compareWith', FILTER_VALIDATE_URL);
+  $refreshPeriod = filter_input(INPUT_GET, 'refreshPeriod', FILTER_VALIDATE_INT, ['options' => ['min_range' => 0]]);
+  $sudo          = filter_input(INPUT_GET, 'sudo', FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE);
 }
\ No newline at end of file
diff --git a/hostScan.xsl b/hostScan.xsl
index d59d688..49bfef3 100755
--- a/hostScan.xsl
+++ b/hostScan.xsl
@@ -79,7 +79,7 @@
                     <form id="lanScanForm" class="right menu" onsubmit="targetsInputDiv.classList.add('loading')">
                         <div class="ui category search item">
                             <div id="targetsInputDiv" class="ui icon input">
-                            <input class="prompt" type="text" id="targetsInput" name="targets" oninput="hiddenInput.value=this.value" required=""
+                            <input class="prompt" type="text" id="targetsInput" name="targets" oninput="hiddenInput.value=this.value"
                                 pattern="[a-zA-Z0-9._\/ \-]+" value="{$targets}" placeholder="Scanner un réseau..."
                                 title="Les cibles peuvent être spécifiées par des noms d'hôtes, des adresses IP, des adresses de réseaux, etc.
 Exemples: 192.168.1.0/24 scanme.nmap.org 10.0-255.0-255.1-254"/>
@@ -88,7 +88,7 @@ Exemples: 192.168.1.0/24 scanme.nmap.org 10.0-255.0-255.1-254"/>
                             <input type="hidden" name="compareWith" value="{$nextCompareWith}"/>
                             <input type="hidden" name="refreshPeriod" value="{$refreshPeriod}"/>
                             <button style="display: none;" type="submit" formmethod="get" formaction="{$basedir}/scan.php"></button>
-                            <button class="ui teal icon submit button" type="submit" formmethod="get" formaction="{$basedir}/options.php" onclick="targetsInput.required=false">
+                            <button class="ui teal icon submit button" type="submit" formmethod="get" formaction="{$basedir}/options.php">
                                 <i class="sliders horizontal icon"></i>
                             </button>
                             <button class="ui teal icon submit button" type="submit" formmethod="get" formaction="{$basedir}/scan.php" onclick="this.getElementsByTagName('i')[0].className = 'loading spinner icon'">
@@ -169,16 +169,18 @@ $.toast({
 </xsl:if>
 
 hiddenButton.onclick = function(event) {
-    targetsInputDiv.classList.add('loading')
-    $.toast({
-        title      : 'Scan en cours...',
-        message    : 'Merci de patienter',
-        class      : 'info',
-        showIcon   : 'satellite dish',
-        displayTime: 0,
-        closeIcon  : true,
-        position   : 'bottom right',
-    })
+    if (lanScanForm.form.checkValidity()) {
+        targetsInputDiv.classList.add('loading')
+        $.toast({
+            title      : 'Scan en cours...',
+            message    : 'Merci de patienter',
+            class      : 'info',
+            showIcon   : 'satellite dish',
+            displayTime: 0,
+            closeIcon  : true,
+            position   : 'bottom right',
+        })
+    }
 }
 refreshButton.onclick = function(event) {
     refreshButton.getElementsByTagName('i')[0].className = 'loading spinner icon'
diff --git a/index.php b/index.php
index 1b0dcab..5727bd1 100755
--- a/index.php
+++ b/index.php
@@ -26,7 +26,7 @@ include_once 'filter_inputs.php';
     <form id="lanScanForm" class="right menu">
       <div class="ui category search item">
           <div id="targetsInputDiv" class="ui icon input">
-            <input class="prompt" type="text" id="targetsInput" name="lan" required
+            <input class="prompt" type="text" id="targetsInput" name="lan"
               pattern="[a-zA-Z0-9._\/ \-]+" value="<?= $targets; ?>" placeholder="Scanner un réseau..."
               title="Les cibles peuvent être spécifiées par des noms d'hôtes, des adresses IP, des adresses de réseaux, etc.
 Exemples: <?= $_SERVER['REMOTE_ADDR']; ?>/24 <?= $_SERVER['SERVER_NAME']; ?> 10.0-255.0-255.1-254" />
@@ -64,16 +64,18 @@ foreach (scandir($SCANSDIR) as $filename) {
     </div>
     <script>
 hiddenButton.onclick = (event) => {
-  targetsInputDiv.classList.add('loading')
-  $.toast({
-      title: 'Scan en cours...',
-      message: 'Merci de patienter',
-      class: 'info',
-      showIcon: 'satellite dish',
-      displayTime: 0,
-      closeIcon: true,
-      position: 'bottom right',
-  })
+  if (lanScanForm.form.checkValidity()) {
+    targetsInputDiv.classList.add('loading')
+    $.toast({
+        title: 'Scan en cours...',
+        message: 'Merci de patienter',
+        class: 'info',
+        showIcon: 'satellite dish',
+        displayTime: 0,
+        closeIcon: true,
+        position: 'bottom right',
+    })
+  }
 }
     </script>
   </main>
diff --git a/lanScan.xsl b/lanScan.xsl
index 8dad605..4b7c5a8 100755
--- a/lanScan.xsl
+++ b/lanScan.xsl
@@ -83,7 +83,7 @@
                         </xsl:call-template>
                         <div class="ui category search item">
                             <div id="targetsInputDiv" class="ui icon input">
-                            <input class="prompt" type="text" id="targetsInput" name="targets" oninput="hiddenInput.value=this.value" required=""
+                            <input class="prompt" type="text" id="targetsInput" name="targets" oninput="hiddenInput.value=this.value"
                                 pattern="[a-zA-Z0-9._\/ \-]+" value="{$targets}" placeholder="Scanner un réseau..."
                                 title="Les cibles peuvent être spécifiées par des noms d'hôtes, des adresses IP, des adresses de réseaux, etc.
 Exemples: 192.168.1.0/24 scanme.nmap.org 10.0-255.0-255.1-254"/>
@@ -92,7 +92,7 @@ Exemples: 192.168.1.0/24 scanme.nmap.org 10.0-255.0-255.1-254"/>
                             <input type="hidden" name="compareWith" value="{$nextCompareWith}"/>
                             <input type="hidden" name="refreshPeriod" value="{$refreshPeriod}"/>
                             <button id="hiddenButton" style="display: none;" type="submit" formmethod="get" formaction="{$basedir}/scan.php"></button>
-                            <button class="ui teal icon submit button" type="submit" formmethod="get" formaction="{$basedir}/options.php" onclick="targetsInput.required=false">
+                            <button class="ui teal icon submit button" type="submit" formmethod="get" formaction="{$basedir}/options.php">
                                 <i class="sliders horizontal icon"></i>
                             </button>
                             <button id="refreshButton" class="ui teal icon submit button" type="submit" formmethod="get" formaction="{$basedir}/scan.php">
@@ -189,16 +189,18 @@ $.toast({
 </xsl:if>
 
 hiddenButton.onclick = function(event) {
-    targetsInputDiv.classList.add('loading')
-    $.toast({
-        title      : 'Scan en cours...',
-        message    : 'Merci de patienter',
-        class      : 'info',
-        showIcon   : 'satellite dish',
-        displayTime: 0,
-        closeIcon  : true,
-        position   : 'bottom right',
-    })
+    if (lanScanForm.form.checkValidity()) {
+        targetsInputDiv.classList.add('loading')
+        $.toast({
+            title      : 'Scan en cours...',
+            message    : 'Merci de patienter',
+            class      : 'info',
+            showIcon   : 'satellite dish',
+            displayTime: 0,
+            closeIcon  : true,
+            position   : 'bottom right',
+        })
+    }
 }
 refreshButton.onclick = function(event) {
     refreshButton.getElementsByTagName('i')[0].className = 'loading spinner icon'
diff --git a/options.php b/options.php
index 5022bf2..9d74daf 100755
--- a/options.php
+++ b/options.php
@@ -46,10 +46,10 @@ include_once 'filter_inputs.php';
     <h1 class="header">Scanner un <?=$host? "hôte" : "réseau" ?></h1>
 
     <form id="newScanForm" class="ui form" method="get" action="scan.php">
-      <div class="required field">
+      <div class="field">
         <label for="targetsInput" title="Les cibles peuvent être spécifiées par des noms d'hôtes, des adresses IP, des adresses de réseaux, etc.
 Exemples: <?= $_SERVER['REMOTE_ADDR']; ?>/24 <?= $_SERVER['SERVER_NAME']; ?> 10.0-255.0-255.1-254">Cibles</label>
-        <input id="targetsInput" type="text" name="targets" placeholder="Cibles" required
+        <input id="targetsInput" type="text" name="targets" placeholder="Cibles"
           pattern="[a-zA-Z0-9._\/ \-]+" value="<?= $targets; ?>" list="targetsList"
           title="Les cibles peuvent être spécifiées par des noms d'hôtes, des adresses IP, des adresses de réseaux, etc.
 Exemples: <?= $_SERVER['REMOTE_ADDR']; ?>/24 <?= $_SERVER['SERVER_NAME']; ?> 10.0-255.0-255.1-254" />
diff --git a/scan.php b/scan.php
index c315760..a4b36b5 100755
--- a/scan.php
+++ b/scan.php
@@ -2,13 +2,6 @@
 
 include_once 'filter_inputs.php';
 
-if (!$targets) {
-    http_response_code(400);
-    $errorMessage = "Valeur incorecte pour le paramètre <var>targets</var> : " . filter_input(INPUT_GET, "targets", FILTER_SANITIZE_FULL_SPECIAL_CHARS);
-    include_once "options.php";
-    die();
-}
-
 if (!file_exists($SCANSDIR)) mkdir($SCANSDIR);
 
 $args = '';