Changeset 622

Timestamp:

02/11/2011 06:36:22 PM (2 years ago)

Author:

sullo

Message:

More fixes for nmap grepable output!

Location:

trunk

Files:

• nikto.pl (modified) (2 diffs)
• plugins/nikto_core.plugin (modified) (2 diffs)

trunk/nikto.pl

@@ -2 +2 @@
 use strict;
 
-#VERSION,2.1.3
+#VERSION,2.1.4
 # $Id$
 use Getopt::Long;
@@ -48 +48 @@
 $VARIABLES{'DIV'}         = "-" x 75;
 $VARIABLES{'name'}        = "Nikto";
-$VARIABLES{'version'}     = "2.1.3";
+$VARIABLES{'version'}     = "2.1.4";
 $VARIABLES{'configfile'}  = "/etc/nikto.conf";    ### Change if it's having trouble finding it
 

trunk/plugins/nikto_core.plugin

@@ -1012 +1012 @@
     my ($file) = @_;
     my (@results, $hostdesc);
-    my $nmap = 0;
-
+    my ($nmap, $lineno) = 0;
+   
     open(IN, $file) || die print STDERR "+ ERROR: Cannot open '$file':$@\n";
     while (<IN>) {
         my $found = 0;
+        $lineno++;
 
         # Check whether this is a greppable nmap file
         chomp;
+        #nprint("\nParsing line $lineno: $_", "d");
         $nmap = 1 if (/^# Nmap/);
         s/\#.*$//;
@@ -1028 +1030 @@
             if (($_ !~ /Host/) || ($_ !~ /Ports/) || ($_ !~ /open/) || ($_ !~ /(?:http|ssl)/i)) { next; }
 
+            # parse out the line
+            my @fields = split("\t", $_);
+
             # Get the host name
-            my @line = split(/ /);
-            $_ =~ /\(([^\)]+)/;
-            $hostdesc = ($1 ne "") ? $1 : $line[1];
+            $fields[0] =~ /Host:\s+([\d\.]+)\s+\(([^\)]+)?\)/;
+            $hostdesc = ($2 ne "") ? $2 : $1;
 
             # Parse the ports list from:
             # Host: 1.0.0.0 ()  Ports: 80/open/tcp//http///, 8000/open/tcp//http-alt///
-            for (my $i = 3 ; $i <= $#line ; $i++) {
-                if (($line[$i] !~ /open\/tcp/) || ($line[$i] !~ /http/)) { next; }
-                    $line[$i] =~ /^(\d+)\//;
+            $fields[1]=~s/^Ports: //;
+            my @ports = parse_csv($fields[1]);
+            foreach my $nmp (@ports) { 
+                if (($nmp !~ /(?:80|443)?\/open\/tcp/) || ($nmp !~ /(?:http|ssl)/i)) { 
+                        nprint("\tNon web port identified on line $lineno: $hostdesc port: $nmp","d");
+                        next;
+                        }
+                    $nmp =~ /^(?:\s+)?(\d+)\//;
+                    nprint("\tWeb port identified on line $lineno: $hostdesc port $1 ","d");
                     push(@results, $hostdesc . ":" . $1);
-                }
+                }
             }
         else {