diff --git a/filter_inputs.php b/filter_inputs.php index ae9054d..db5c658 100644 --- a/filter_inputs.php +++ b/filter_inputs.php @@ -5,7 +5,7 @@ $targets = filter_input(INPUT_GET, 'targets', FILTER_VALIDATE_REGEXP, [ 'options' => ['regexp' => "/^[\da-zA-Z-. \/]+$/"], ]); -$name = filter_input(INPUT_GET, 'name', FILTER_VALIDATE_REGEXP, [ +$saveAs = filter_input(INPUT_GET, 'saveAs', FILTER_VALIDATE_REGEXP, [ 'flags' => FILTER_NULL_ON_FAILURE, 'options' => ['regexp' => '/^[^<>:"\/|?]+$/'], ]); @@ -49,10 +49,6 @@ $inputs = filter_input_array(INPUT_GET, [ 'sF' => ['filter' => FILTER_VALIDATE_BOOLEAN], 'sN' => ['filter' => FILTER_VALIDATE_BOOLEAN], 'sX' => ['filter' => FILTER_VALIDATE_BOOLEAN], - 'PU' => ['filter' => FILTER_VALIDATE_BOOLEAN], - 'PM' => ['filter' => FILTER_VALIDATE_BOOLEAN], - 'PM' => ['filter' => FILTER_VALIDATE_BOOLEAN], - 'PM' => ['filter' => FILTER_VALIDATE_BOOLEAN], 'scanflags' => ['filter' => FILTER_VALIDATE_REGEXP, 'options' => ['regexp' => "/^([URG|ACK|PSH|RST|SYN|FIN]+)$|^([0-2]?\d?\d)$/"]], 'sI' => ['filter' => FILTER_VALIDATE_REGEXP, 'options' => ['regexp' => "/^[a-zA-Z\d:.-]+(:\d+)?$/"]], 'sO' => ['filter' => FILTER_VALIDATE_BOOLEAN], @@ -110,7 +106,6 @@ $inputs = filter_input_array(INPUT_GET, [ //'6' => ['filter' => FILTER_VALIDATE_BOOLEAN], 'A' => ['filter' => FILTER_VALIDATE_BOOLEAN], 'send-eth' => ['filter' => FILTER_VALIDATE_BOOLEAN], - 'send-ip' => ['filter' => FILTER_VALIDATE_BOOLEAN], 'privileged' => ['filter' => FILTER_VALIDATE_BOOLEAN], 'V' => ['filter' => FILTER_VALIDATE_BOOLEAN], 'unprivileged' => ['filter' => FILTER_VALIDATE_BOOLEAN], diff --git a/index.php b/index.php index fada129..e733b94 100755 --- a/index.php +++ b/index.php @@ -19,47 +19,50 @@ include_once 'filter_inputs.php'; - +
-
-
-
-
Précédents scans
-
- $targets\n"; - } - } - ?> -
+

Précédents scans

+
+
+
+$name\n"; + } +} +?>
diff --git a/options.php b/options.php index b698ade..9aa1218 100755 --- a/options.php +++ b/options.php @@ -40,10 +40,10 @@ Exemples: /24 10.
- - + +
@@ -225,25 +225,6 @@ foreach (scandir($SCANS_DIR) as $filename) { - -

Précédents scans

-
-
-
- $targets\n"; - } - } - ?> -
-
-
diff --git a/scan.php b/scan.php index 5ff162d..62a8958 100755 --- a/scan.php +++ b/scan.php @@ -12,8 +12,6 @@ if (!file_exists($SCANS_DIR)) { mkdir($SCANS_DIR); } -$basedir = "{$_SERVER['REQUEST_SCHEME']}://{$_SERVER['SERVER_NAME']}:{$_SERVER['SERVER_PORT']}" . dirname($_SERVER['REQUEST_URI']); - $args = ''; foreach ($inputs as $arg => $value) { if (is_null($value)) { @@ -30,6 +28,7 @@ foreach ($inputs as $arg => $value) { } } +$basedir = "{$_SERVER['REQUEST_SCHEME']}://{$_SERVER['SERVER_NAME']}:{$_SERVER['SERVER_PORT']}" . dirname($_SERVER['REQUEST_URI']); exec("nmap$args --stylesheet $basedir/stylesheet.xsl -oX - $targets 2>&1", $result, $code); if ($code) { http_response_code(500); @@ -39,13 +38,13 @@ if ($code) { $xml = new DOMDocument(); $xml->loadXML(implode("\n", $result)); -$xml->insertBefore($xml->createProcessingInstruction('xslt-param', "name='name' value='$name'"), $xml->documentElement); -$xml->insertBefore($xml->createProcessingInstruction('xslt-param', "name='scansDir' value='$SCANS_DIR'"), $xml->documentElement); -$xml->insertBefore($xml->createProcessingInstruction('xslt-param', "name='compareWith' value='$compareWith'"), $xml->documentElement); +$xml->insertBefore($xml->createProcessingInstruction('xslt-param', "name='saveAs' value='".htmlentities($saveAs, ENT_QUOTES)."'"), $xml->documentElement); +$xml->insertBefore($xml->createProcessingInstruction('xslt-param', "name='scansDir' value='".htmlentities($SCANS_DIR, ENT_QUOTES)."'"), $xml->documentElement); +$xml->insertBefore($xml->createProcessingInstruction('xslt-param', "name='compareWith' value='".htmlentities($compareWith, ENT_QUOTES)."'"), $xml->documentElement); -if ($name) { +if ($saveAs) { if (!file_exists($SCANS_DIR)) mkdir($SCANS_DIR); - $path = "$SCANS_DIR/$name.xml"; + $path = "$SCANS_DIR/$saveAs.xml"; $xml->save($path); header("Location: $path"); diff --git a/style.css b/style.css index a777870..cdda9d8 100644 --- a/style.css +++ b/style.css @@ -1,4 +1,4 @@ -.header svg { +svg { margin: -.3em -.5em -.5em -.4em; fill: currentColor; } diff --git a/stylesheet.xsl b/stylesheet.xsl index e7e1c8b..78ae2c0 100755 --- a/stylesheet.xsl +++ b/stylesheet.xsl @@ -8,13 +8,14 @@ - + - + - + + @@ -33,7 +34,7 @@ <xsl:text>lanScan - </xsl:text> <xsl:choose> - <xsl:when test="string-length($nameOrCompareWith)"><xsl:value-of select="$nameOrCompareWith"/></xsl:when> + <xsl:when test="$name"><xsl:value-of select="$name"/></xsl:when> <xsl:otherwise><xsl:value-of select="$targets"/></xsl:otherwise> </xsl:choose> @@ -52,85 +53,85 @@ - + +

- - + +