From baef7123b890e010ce6e6e4547136c01b8dcc17b Mon Sep 17 00:00:00 2001
From: adrien <adrien@malingrey.fr>
Date: Sun, 20 Oct 2024 01:56:33 +0200
Subject: [PATCH] option -T
---
README.md | 15 ++++++++-------
config.php | 4 ++--
filter_inputs.php | 7 +------
index.php | 35 ++++++++++++++++++++---------------
4 files changed, 31 insertions(+), 30 deletions(-)
diff --git a/README.md b/README.md
index 8075fd7..6fdfa9b 100644
--- a/README.md
+++ b/README.md
@@ -8,10 +8,10 @@ On peut personnaliser les options prédéfinies pour les scans de réseau ou d'h
```php
$presets = [
"default" => [
- '-PS' => 'microsoft-ds',
- '-F' => true,
- '-T5' => true,
- '--stylesheet' => "$BASEDIR/xslt/hostsTable.xsl",
+ '-PS' => 'microsoft-ds',
+ '-F' => true,
+ '-T' => 5,
+ '--stylesheet' => "$BASEDIR/templates/hostsTable.xsl",
'refreshPeriod' => 60,
'sudo' => false,
],
@@ -19,10 +19,11 @@ $presets = [
'-Pn' => true,
'-F' => true,
'-sV' => true,
- '-T5' => true,
- '--stylesheet' => "$BASEDIR/xslt/servicesTable.xsl",
+ '-T' => 5,
+ '--script' => "http-info,smb-shares-size",
+ '--stylesheet' => "$BASEDIR/templates/servicesTable.xsl",
'refreshPeriod' => 60,
- 'sudo' => false,
+ 'sudo' => true,
],
];
```
diff --git a/config.php b/config.php
index a4fdb03..ab0bcf5 100644
--- a/config.php
+++ b/config.php
@@ -10,7 +10,7 @@ $presets = [
"default" => [
'-PS' => 'microsoft-ds',
'-F' => true,
- '-T5' => true,
+ '-T' => 5,
'--stylesheet' => "$BASEDIR/templates/hostsTable.xsl",
'refreshPeriod' => 60,
'sudo' => false,
@@ -19,7 +19,7 @@ $presets = [
'-Pn' => true,
'-F' => true,
'-sV' => true,
- '-T5' => true,
+ '-T' => 5,
'--script' => "http-info,smb-shares-size",
'--stylesheet' => "$BASEDIR/templates/servicesTable.xsl",
'refreshPeriod' => 60,
diff --git a/filter_inputs.php b/filter_inputs.php
index 3d93207..31a2ec0 100644
--- a/filter_inputs.php
+++ b/filter_inputs.php
@@ -73,12 +73,7 @@ if ($preset && isset($presets[$preset])) {
'--osscan-guess' => FILTER_VALIDATE_BOOLEAN,
'--max-os-tries' => ['filter' => FILTER_VALIDATE_INT, 'options' => ['min_range' => 0]],
// TIMING AND PERFORMANCE:
- '-T0' => FILTER_VALIDATE_BOOLEAN,
- '-T1' => FILTER_VALIDATE_BOOLEAN,
- '-T2' => FILTER_VALIDATE_BOOLEAN,
- '-T3' => FILTER_VALIDATE_BOOLEAN,
- '-T4' => FILTER_VALIDATE_BOOLEAN,
- '-T5' => FILTER_VALIDATE_BOOLEAN,
+ '-T' => ['filter' => FILTER_VALIDATE_INT, 'options' => ['min_range' => 0, 'max_range' => 5]],
'--min-hostgroup' => ['filter' => FILTER_VALIDATE_INT, 'options' => ['min_range' => 0]],
'--max-hostgroup' => ['filter' => FILTER_VALIDATE_INT, 'options' => ['min_range' => 0]],
'--min-parallelism' => ['filter' => FILTER_VALIDATE_INT, 'options' => ['min_range' => 0]],
diff --git a/index.php b/index.php
index 87da770..2dbb4dc 100755
--- a/index.php
+++ b/index.php
@@ -319,21 +319,11 @@ Exemples: <?= $_SERVER['REMOTE_ADDR']; ?>/24 <?= $_SERVER['SERVER_NAME']; ?> 10.
<label for="allportsCheckbox" title="--allports">N'exclure aucun port de la détection de version</label>
</div>
</div>
-
+
<div class="field">
- <label for="versionIntensitySelect" title="--version-intensity">Intensité des tests de version</label>
- <select class="ui dropdown" id="versionIntensitySelect" name="--version-intensity" value="<?= $options["--version-intensity"] ?? ""?>">
- <option value="0">0</option>
- <option value="1">1</option>
- <option value="2">2 Léger</option>
- <option value="3">3</option>
- <option value="4">4</option>
- <option value="5">5</option>
- <option value="6">6</option>
- <option value="7">7 Défaut</option>
- <option value="8">8</option>
- <option value="9">9 Tous</option>
- </select>
+ <label for="versionIntensityInput" title="--version-intensity">Intensité des tests de version</label>
+ <input type="number" min="0" max="9" id="versionIntensityInput" name="--version-intensity" placeholder="Intensité"
+ value="<?= $options["--version-intensity"] ?? "" ?>" title="2: léger, 9: tous, défaut: 7">
</div>
<div class="inline field">
@@ -385,12 +375,27 @@ Exemples: <?= $_SERVER['REMOTE_ADDR']; ?>/24 <?= $_SERVER['SERVER_NAME']; ?> 10.
</div>
<div class="field">
- <label for="maxOSTriesInput">Nombre d'essais maximum</label>
+ <label for="maxOSTriesInput" title="--max-os-tries">Nombre d'essais maximum</label>
<input type="number" min="0" id="maxOSTriesInput" name="--max-os-tries" placeholder="Nombre d'essais"
value="<?= $options["--max-os-tries"] ?? "" ?>">
</div>
</div>
+ <div class="title"><i class="icon dropdown"></i>Temporisation et performances</div>
+ <div class="content">
+ <div class="field">
+ <label for="TSelect" title="--T">Intensité des tests de version</label>
+ <select class="ui dropdown" id="TSelect" name="-T" value="<?= $options["-T"] ?? ""?>">
+ <option value="0"<?=($options["-T"]??"")==0?" selected":""?>>Paranoïaque</option>
+ <option value="1"<?=($options["-T"]??"")==1?" selected":""?>>Sournois</option>
+ <option value="2"<?=($options["-T"]??"")==2?" selected":""?>>Poli</option>
+ <option value="3"<?=($options["-T"]??"")==3?" selected":""?>>Normal</option>
+ <option value="4"<?=($options["-T"]??"")==4?" selected":""?>>Aggressif</option>
+ <option value="5"<?=($options["-T"]??"")==5?" selected":""?>>Dément</option>
+ </select>
+ </div>
+ </div>
+
<div class="title"><i class="icon dropdown"></i>Divers</div>
<div class="content">
<div class="field">