Changeset 87

Timestamp:

11/11/2008 07:13:19 PM (5 years ago)

Author:

deity

Message:

Added report phase to plugin runner

Location:

trunk

Files:

• config.txt (modified) (1 diff)
• docs/CHANGES.txt (modified) (1 diff)
• nikto.pl (modified) (4 diffs)
• plugins/db_outdated (modified) (1 diff)
• plugins/nikto_apacheusers.plugin (modified) (1 diff)
• plugins/nikto_core.plugin (modified) (4 diffs)
• plugins/nikto_reports.plugin (modified) (1 diff)

trunk/config.txt

@@ -45 +45 @@
 #########################################################################################################
 #PROXYHOST=127.0.0.1
-#PROXYPORT=8080
+#PROXYPORT=3128
 #PROXYUSER=proxyuserid
 #PROXYPASS=proxypassword

trunk/docs/CHANGES.txt

@@ +1 @@
+2008-11-11 plugins/nikto_core.plugin nikto.pl plugins/nikto_reports.plugin
+        - Added report phase to plugin runner
 2008-10-09 plugins/nikto_core.plugin nikto.pl
         - Further tunings to authentication code to simplify it.

trunk/nikto.pl

@@ -41 +41 @@
 
 # global var/definitions
-use vars qw/$TEMPLATES %ERRSTRINGS %VERSIONS %CLI %VARIABLES %TESTS $CONTENT %FILES $CURRENT_HOST_ID $CURRENT_PORT/;
-use vars qw/%REALMS %REALMS_TESTED %NIKTOCONFIG %NIKTO %OUTPUT %SERVER %request %result %COUNTERS $STARTTIME/;
+use vars qw/$TEMPLATES %ERRSTRINGS %CLI %VARIABLES %TESTS $CONTENT $CURRENT_HOST_ID $CURRENT_PORT/;
+use vars qw/%NIKTO %REALMS %NIKTOCONFIG %request %result %COUNTERS $STARTTIME/;
 use vars qw/%db_extensions %FoF %UPDATES $DIV %TARGETS @DBFILE @SERVERFILE @BUILDITEMS $PROXYCHECKED $http_eol/;
 use vars qw/@RESULTS @PLUGINS/;
@@ -67 +67 @@
 require "$NIKTO{plugindir}/nikto_core.plugin";    ### Change this line if your setup is having trouble finding it
 nprint("T:$STARTTIME: Starting", "d");
-require "$NIKTO{plugindir}/nikto_reports.plugin";    ### Change this line if your setup is having trouble finding it
+#require "$NIKTO{plugindir}/nikto_reports.plugin";    ### Change this line if your setup is having trouble finding it
 require "$NIKTO{plugindir}/nikto_single.plugin";     ### Change this line if your setup is having trouble finding it
 require "$NIKTO{plugindir}/LW2.pm";                  ### Change this line if your setup is having trouble finding it
@@ -89 +89 @@
 proxy_setup();
 
-open_output();
+#open_output();
 nprint($DIV);
 
@@ -158 +158 @@
                 test_target();
             }
-            write_output();
+            run_report();
         }
     }

trunk/plugins/db_outdated

@@ -385 +385 @@
 "600374","Microsoft_PWS_Mac/","4.0b1","@RUNNING_VER appears to be outdated (current is at least @CURRENT_VER)"
 "600375","Microsoft-HTTPAPI/","1.0","@RUNNING_VER appears to be outdated (current is at least @CURRENT_VER)"
-"600376","Microsoft-IIS/","6.0","@RUNNING_VER appears to be outdated (4.0 for NT 4, 5.0 for Win2k)"
+"600376","Microsoft-IIS/","6.0","@RUNNING_VER appears to be outdated (4.0 for NT 4, 5.0 for Win2k, current is at least @CURRENT_VER)"
 "600377","Microsoft-Internet-Information-Server/","1.0","@RUNNING_VER appears to be outdated (current is at least @CURRENT_VER)"
 "600378","Microsoft-PWS-95/","2.0","@RUNNING_VER appears to be outdated (current is at least @CURRENT_VER)"

trunk/plugins/nikto_apacheusers.plugin

@@ -50 +50 @@
       if ($CONTENT !~ /forbidden/i)    # Good, it gave an error instead of forbidden
       {
-         add_vulnerability(CURRENT_HOST_ID, "Enumeration of users is possible by requesting ~username (responds with 'Forbidden' for users, 'not found' for non-existent users).", 999999, 637, "GET", "/~root");
+         add_vulnerability($CURRENT_HOST_ID, "Enumeration of users is possible by requesting ~username (responds with 'Forbidden' for users, 'not found' for non-existent users).", 999999, 637, "GET", "/~root");
       }
    }

trunk/plugins/nikto_core.plugin

@@ -173 +173 @@
 
             $TESTS{$CHECKID}{osvdb} =~ s/\s+/ OSVDB\-/g;
-            add_vulnerability($CURRENT_HOST_ID,"$TESTS{$CHECKID}{method} $request{whisker}{uri}: $TESTS{$CHECKID}{message}",$CHECKID,$TESTS{$CHECKID}{osvdb},"",$uri);
+            add_vulnerability($CURRENT_HOST_ID,"$request{whisker}{uri}: $TESTS{$CHECKID}{message}",$CHECKID,$TESTS{$CHECKID}{osvdb},$TESTS{$CHECKID}{method},$uri);
          }
       }
@@ -590 +590 @@
     
  return;
-}
-###############################################################################
-sub badargs
-{
- print("HERE\n");
- my $i;
- for ($i=0;$i<=$#_;$i++)
- {
-  print("Argument: $_[$i]\n");
- }
 }
 ###############################################################################
@@ -1422 +1412 @@
             $pluginhash->{recon_weight}=50 unless (defined $pluginhash->{recon_weight});
             $pluginhash->{scan_weight}=50 unless (defined $pluginhash->{scan_weight});
+            $pluginhash->{report_weight}=50 unless (defined $pluginhash->{report_weight});
             push(@PLUGINS, $pluginhash);
             nprint("- Loaded \"$pluginhash->{full_name}\" plugin.","v");
@@ -1477 +1468 @@
                nprint("- Running scan for \"$plugin->{full_name}\" plugin","v");
                &{$plugin->{scan_method}};
+            }
+         }
+      }
+   }
+   
+   return;
+}
+   
+sub run_report
+{
+   nprint("- Entering report phase","v");
+   # This is a frig until I can think of a better way of achieving it
+   foreach my $i (1..100)
+   {
+      foreach my $plugin (@PLUGINS)
+      {
+         if (defined $plugin->{report_method} && $plugin->{report_weight} == $i)
+         {
+            my $run=1;
+            # first check for conditionals
+            if (defined $plugin->{report_cond})
+            {
+               # Evaluate condition
+               $run=eval "$plugin->{report_cond}";
+            }
+            if ($run)
+            {   
+               nprint("- Running report for \"$plugin->{full_name}\" plugin","v");
+               &{$plugin->{report_method}};
             }
          }

trunk/plugins/nikto_reports.plugin

@@ -24 +24 @@
 # Reporting
 ###############################################################################
+sub nikto_reports_init
+{
+   my $id =
+   {
+      name         => "reports",
+      full_name    => "Report as XML or HTML",
+      author       => "Sullo",
+      description  => "Produces an XML or HTML report.",
+      recon_method => \&open_output,
+      report_method  => \&write_output,
+      copyright    => "2008 CIRT Inc."
+   };
+   return $id;
+}
 
 sub open_output