Changeset 703

Timestamp:

12/15/2011 05:26:31 AM (18 months ago)

Author:

sullo

Message:

Ticket 229: Don't repeat XML headers if appending to an existing report file, thanks to digininja for idea

Location:

trunk

Files:

• docs/CHANGES.txt (modified) (1 diff)
• plugins/nikto_core.plugin (modified) (1 diff)
• plugins/nikto_report_xml.plugin (modified) (1 diff)
• templates/xml_host_head.tmpl (modified) (1 diff)
• templates/xml_start.tmpl (modified) (1 diff)

trunk/docs/CHANGES.txt

@@ -1 +1 @@
 2011-12-11
+        - Ticket 229: Don't repeat XML headers if appending to an existing report file, thanks to digininja for idea
         - Ticket 228: Add client SSL certificate support. Thanks to monnerat for code submission!
         - Ticket 226: Add GMT offset to time outputs

trunk/plugins/nikto_core.plugin

@@ -1421 +1421 @@
 
             if ($res) {
-
-      # this will fix for some Apaches that are smart enough to answer non ssl reqs on an ssl server
+                        # this will fix for some Apaches that are smart enough to answer non ssl reqs on an ssl server
                 if (defined $content
                     && $content =~ /speaking plain HTTP to an SSL/) {
                     dump_var("Result Hash", \%result);
                     next;
-                }
+                        }
                 nprint("- $checkssl Server found: "
                          . ($hostname || $ip)

trunk/plugins/nikto_report_xml.plugin

@@ -43 +43 @@
 sub xml_head {
     my ($file) = @_;
-
-    # Write header for xml file, return file handle
+    
+    # check for xml headers
+    $header_present=0;
+
+    if (-e $file) { 
+        open(IN,"<$file") || die print STDERR "+ ERROR: Unable to open '$file' for read: $@\n";
+        my $linectr=0;
+        while (<IN>) { 
+                $linectr++;
+                if ($_ =~ /DOCTYPE niktoscan/) { $header_present=1; last; }
+                if ($linectr > 10) { last; }
+                        }
+                close(IN);
+        }
+
     open(OUT, ">>$file") || die print STDERR "+ ERROR: Unable to open '$file' for write: $@\n";
-
-    my $xml = xml_change_vars($TEMPLATES{xml_start});
-    $xml =~ s/\#NIKTODTD#/$CONFIGFILE{NIKTODTD}/;
-    print OUT "$xml";
-
+ 
+        # If file doesn't contain a header, write it
+        if (!$header_present) { 
+            my $xml = xml_change_vars($TEMPLATES{xml_start});
+        $xml =~ s/\#NIKTODTD#/$CONFIGFILE{NIKTODTD}/;
+            print OUT "$xml";
+            }
+
+        # Return file handle
     return OUT;
 }

trunk/templates/xml_host_head.tmpl

@@ +1 @@
+<niktoscan hoststest="#TEMPL_NIKTO_HOSTS_TESTED#" options="#TEMPL_NIKTO_CLI#" version="#TEMPL_NIKTO_VER#" scanstart="#TEMPL_SCAN_START#" scanend="#TEMPL_SCAN_END#" scanelapsed="#TEMPL_SCAN_ELAPSED#" nxmlversion="1.2">
+
 <scandetails targetip="#TEMPL_IP#" targethostname="#TEMPL_HOSTNAME#" targetport="#TEMPL_PORT#" targetbanner="#TEMPL_BANNER#" starttime="#TEMPL_START#" sitename="#TEMPL_LINK_NAME#" siteip="#TEMPL_LINK_IP#" hostheader="#TEMPL_HOST_HEADER#" errors="#TEMPL_ERRORS#" checks="#TEMPL_CTR#">
 #TEMPL_SSL_INFO#

trunk/templates/xml_start.tmpl

@@ -1 +1 @@
 <?xml version="1.0" ?>
 <!DOCTYPE niktoscan SYSTEM "#NIKTODTD#">
-<niktoscan hoststest="#TEMPL_NIKTO_HOSTS_TESTED#" options="#TEMPL_NIKTO_CLI#" version="#TEMPL_NIKTO_VER#" scanstart="#TEMPL_SCAN_START#" scanend="#TEMPL_SCAN_END#" scanelapsed="#TEMPL_SCAN_ELAPSED#" nxmlversion="1.2">