Changeset 738

Timestamp:

04/06/2012 04:15:21 AM (14 months ago)

Author:

sullo

Message:

Ticket 214: relocate dbs to 'databases' directory

Location:

trunk

Files:

• databases (added)
• databases/db_404_strings (added)
• databases/db_content_search (added)
• databases/db_embedded (added)
• databases/db_favicon (added)
• databases/db_headers (added)
• databases/db_httpoptions (added)
• databases/db_multiple_index (added)
• databases/db_outdated (added)
• databases/db_parked_strings (added)
• databases/db_realms (added)
• databases/db_server_msgs (added)
• databases/db_subdomains (added)
• databases/db_tests (added)
• databases/db_variables (added)
• docs/CHANGES.txt (modified) (1 diff)
• nikto.conf (modified) (2 diffs)
• nikto.pl (modified) (1 diff)
• plugins/db_404_strings (deleted)
• plugins/db_content_search (deleted)
• plugins/db_embedded (deleted)
• plugins/db_favicon (deleted)
• plugins/db_headers (deleted)
• plugins/db_httpoptions (deleted)
• plugins/db_multiple_index (deleted)
• plugins/db_outdated (deleted)
• plugins/db_parked_strings (deleted)
• plugins/db_realms (deleted)
• plugins/db_server_msgs (deleted)
• plugins/db_subdomains (deleted)
• plugins/db_tests (deleted)
• plugins/db_variables (deleted)
• plugins/nikto_core.plugin (modified) (13 diffs)

trunk/docs/CHANGES.txt

@@ -8 +8 @@
         - Ticket 220: Certificate wildcard matching incorrect
         - Ticket 217: Add -IgnoreCode option to allow db_404_strings' @CODE at the command line
+        - Ticket 214: Relocate databases to 'databases/' directory from 'plugins/'
         - Ticket 211: Shuffled some information in HTML report and added more summary data. Added error count and total check count to XML (note: DTD change).
         - Ticket 202: -maxtime maximum execution time per host (seconds)

trunk/nikto.conf

@@ -22 +22 @@
 # IDs never to alert on (Note: this only works for IDs loaded from db_tests)
 #SKIPIDS=
-
-# if Nikto is having difficulty finding the 'plugins', set the full install path here
-# EXECDIR=/usr/local/nikto
 
 # The DTD
@@ -65 +62 @@
 
 # If you want to specify the location of any of the files, specify them here
-# EXECDIR=/opt/nikto
-# PLUGINDIR=/opt/nikto/plugins
-# TEMPLATEDIR=/opt/nikto/templates
-# DOCDIR=/opt/nikto/docs
+# EXECDIR=/opt/nikto                            # Location of Nikto
+# PLUGINDIR=/opt/nikto/plugins                  # Location of plugin dir
+# DBDIR=/opt/nikto/databases                    # Location of plugin dir
+# TEMPLATEDIR=/opt/nikto/templates              # Location of tempmlate dir
+# DOCDIR=/opt/nikto/docs                        # Location of docs dir
 
 # Default plugin macros

trunk/nikto.pl

@@ -332 +332 @@
         $CONFIGFILE{'DOCUMENTDIR'} = "$CONFIGFILE{'EXECDIR'}/docs";
     }
+    unless (defined $CONFIGFILE{'DBDIR'}) {
+        $CONFIGFILE{'DBDIR'} = "$CONFIGFILE{'EXECDIR'}/databases";
+    }
     return;
 }

trunk/plugins/nikto_core.plugin

@@ -757 +757 @@
 
     # get core version
-    open(FI, "<$CONFIGFILE{PLUGINDIR}/nikto_core.plugin");
+    open(FI, "<$CONFIGFILE{'PLUGINDIR'}/nikto_core.plugin");
     my @F = <FI>;
     close(FI);
@@ -1188 +1188 @@
     # verify required files
     for my $file (@dbs) {
-        if (!-r "$CONFIGFILE{PLUGINDIR}/$file") {
-            die nprint("+ ERROR: Can't find/read required file \"$CONFIGFILE{PLUGINDIR}/$file\"");
+        if (!-r "$CONFIGFILE{'DBDIR'}/$file") {
+            die nprint("+ ERROR: Can't find/read required file \"$CONFIGFILE{'DBDIR'}/$file\"");
         }
     }
 
     for my $file (@dbs) {
-        my $filename = $CONFIGFILE{PLUGINDIR} . "/" . $prefix . $file;
+        my $filename = $CONFIGFILE{DBDIR} . "/" . $prefix . $file;
         if (!-r $filename) { next; }
         open(IN, "<$filename") || die nprint("+ ERROR: Can't open \"$filename\":$!\n");
@@ -1280 +1280 @@
 
     for my $file (@dbs) {
-        my $filename = $CONFIGFILE{PLUGINDIR} . "/" . $prefix . $file;
+        my $filename = $CONFIGFILE{DBDIR} . "/" . $prefix . $file;
         if (!-r $filename) {
             nprint("+ ERROR: Unable to read \"$filename\"");
@@ -1532 +1532 @@
 ###############################################################################
 sub load_plugins {
-    my @pluginlist = dirlist("$CONFIGFILE{PLUGINDIR}", '\.plugin$');
+    my @pluginlist = dirlist("$CONFIGFILE{'PLUGINDIR'}", '\.plugin$');
     my @all_names;
 
@@ -1547 +1547 @@
         $plugin_name =~ s/\.plugin$//;
         my $plugin_init = $plugin_name . "_init";
-        eval { require "$CONFIGFILE{PLUGINDIR}/$plugin"; };
+        eval { require "$CONFIGFILE{'PLUGINDIR'}/$plugin"; };
         if ($@) {
             nprint("- Could not load or parse plugin: $plugin_name\n Error: ");
@@ -1856 +1856 @@
 
     # get local versions of plugins/dbs
-    my @NIKTOFILES = dirlist($CONFIGFILE{PLUGINDIR}, "");
-
-    foreach my $file (@NIKTOFILES) {
+    my %NIKTOFILES;
+    my @F = dirlist($CONFIGFILE{'PLUGINDIR'}, "");
+    foreach my $f (@F) { $NIKTOFILES{$f}=$CONFIGFILE{'PLUGINDIR'} . "/" . $f; }
+    @F = dirlist($CONFIGFILE{'DBDIR'}, "");
+    foreach my $f (@F) { $NIKTOFILES{$f}=$CONFIGFILE{'DBDIR'} . "/" . $f; }
+
+    foreach my $file (keys %NIKTOFILES) {
         my $v = "";
-        open(LOCAL, "<$CONFIGFILE{PLUGINDIR}/$file")
-          || print STDERR "+ ERROR: Unable to open '$CONFIGFILE{PLUGINDIR}/$file' for read: $@\n";
+        open(LOCAL, "<$NIKTOFILES{$file}")
+          || print STDERR "+ ERROR: Unable to open '$NIKTOFILES{$file}' for read: $@\n";
         my @l = <LOCAL>;
         close(LOCAL);
@@ -1903 +1907 @@
         }
         if ($CONTENT ne "") {
-            open(OUT, ">$CONFIGFILE{PLUGINDIR}/$toget")
+            my $dir='';
+            if ($toget =~ /^db_/) { $dir=$CONFIGFILE{'DBDIR'}; }
+            else { $dir=$CONFIGFILE{'PLUGINDIR'}; }
+            open(OUT, ">$dir/$toget")
               || die print STDERR
-              "+ ERROR: Unable to open '$CONFIGFILE{PLUGINDIR}/$toget' for write: $@\n";
+              "+ ERROR: Unable to open '$dir/$toget' for write: $@\n";
             print OUT $CONTENT;
             close(OUT);
@@ -2525 +2532 @@
 #######################################################################
 sub version {
-    my @NIKTOFILES = dirlist($CONFIGFILE{PLUGINDIR}, "(^nikto|^db_)");
+    my %NIKTOFILES;
+    my @F = dirlist($CONFIGFILE{'PLUGINDIR'}, "");
+    foreach my $f (@F) { $NIKTOFILES{$f}=$CONFIGFILE{'PLUGINDIR'} . "/" . $f; }
+    @F = dirlist($CONFIGFILE{'DBDIR'}, "");
+    foreach my $f (@F) { $NIKTOFILES{$f}=$CONFIGFILE{'DBDIR'} . "/" . $f; }
+
     nprint($VARIABLES{'DIV'});
     nprint("$VARIABLES{'name'} Versions");
@@ -2534 +2546 @@
     nprint("LibWhisker                         $LW2::VERSION");
 
-    foreach my $FILE (sort @NIKTOFILES) {
-        open(FI, "<$CONFIGFILE{PLUGINDIR}/$FILE")
-          || die print STDERR "+ ERROR: Unable to open '$CONFIGFILE{PLUGINDIR}/$FILE': $!\n";
+    foreach my $FILE (sort keys %NIKTOFILES) {
+        next if $FILE eq 'LW2.pm';
+        open(FI, "<$NIKTOFILES{$FILE}")
+          || die print STDERR "+ ERROR: Unable to open '$NIKTOFILES{$FILE}': $!\n";
         my @F = <FI>;
         close(FI);
@@ -2560 +2573 @@
         nprint("Module RPC::XML::Client missing. Logging to Metasploit is disabled.");
     }
+    LW2::init_ssl_engine();
     my ($avail, $lib, $ver) = LW2::ssl_is_available();
     if ($avail) {
-        nprint("SSL: $lib $ver");
+        nprint("SSL Module: $lib version $ver");
     }
     else {
@@ -2597 +2611 @@
 
     # make sure the db_outdatedb isn't *too* old
-    open(OD, "<$CONFIGFILE{PLUGINDIR}/db_outdated")
-      || die print STDERR "+ ERROR: Unable to open '$CONFIGFILE{PLUGINDIR}/db_outdated': $!\n";
+    open(OD, "<$CONFIGFILE{'DBDIR'}/db_outdated")
+      || die print STDERR "+ ERROR: Unable to open '$CONFIGFILE{'DBDIR'}/db_outdated': $!\n";
     @F = <OD>;
     close(OD);
@@ -2800 +2814 @@
 sub init_db {
     my $dbname   = $_[0];
-    my $filename = "$CONFIGFILE{PLUGINDIR}/" . $dbname;
+    my $filename = "$CONFIGFILE{'DBDIR'}/" . $dbname;
     my (@dbarray, @headers);
     my $hashref = {};
@@ -2833 +2847 @@
 
     # And the udb_* file
-    $filename = "$CONFIGFILE{PLUGINDIR}/u" . $dbname;
+    $filename = "$CONFIGFILE{'DBDIR'}/u" . $dbname;
     if (open(IN, "<$filename")) {
         while (<IN>) {