Changeset 614

Timestamp:

01/28/2011 08:51:51 PM (2 years ago)

Author:

sullo

Message:

• <statistics hoststotal="#TEMPL_NIKTO_HOSTS_TESTED" /> removed from templates (duplicate of hoststest)
• <!ATTLIST statistics hoststotal CDATA #IMPLIED> removed from DTD
• Removed duplicate <niktoscan> element from xml_summary.tpl
• Properly close <niktoscan>
• Incremented nxmlversion to 1.1

Location:

trunk

Files:

• docs/CHANGES.txt (modified) (2 diffs)
• docs/nikto.dtd (modified) (1 diff)
• plugins/nikto_report_html.plugin (modified) (1 diff)
• plugins/nikto_report_xml.plugin (modified) (2 diffs)
• templates/xml_close.tmpl (modified) (1 diff)
• templates/xml_start.tmpl (modified) (1 diff)
• templates/xml_summary.tmpl (modified) (1 diff)

trunk/docs/CHANGES.txt

@@ -1 +1 @@
 2010-12-06
+        - Tickets 148, 160, 188: XML CHANGES: 
+                - Removed 'cyphers' from DTD (was never populated via the code)
+                - The 'niktoscan' element is now included (was in schema, but unused)
+                - 'niktoscan' new variables: scanstart, scanend, scanelapsed
+                - <statistics hoststotal="#TEMPL_NIKTO_HOSTS_TESTED" /> removed from templates (duplicate of hoststest)
+                - <!ATTLIST statistics hoststotal CDATA #IMPLIED> removed from DTD
+                - Removed duplicate <niktoscan> element from xml_summary.tpl
+                - Properly close <niktoscan>
+                - Incremented nxmlversion to 1.1
         - Ticket 195: Update interactive status counts if mutate options are used
         - Ticket 194: Look for internal IPs in cookies
         - Ticket 192: Relabel IDS evasion as 'encoding techniques'
-        - Ticket 188: Remove 'cyhpers' from DTD
         - Ticket 186: Enable sleep for fractions of seconds
         - Ticket 184: Fix -root option
@@ -13 +21 @@
         - Ticket 169: Allow regular expressions in db_tests
         - Ticket 155: -findonly is deprecated in favor of -Plugins "@@NONE" (-f will replicate this functionality)
-        - Ticket 148, 160: Added report summary to XML and HTML reports
-                XML CHANGES:
-                - The 'niktoscan' element is now included (was in schema, but unused)
-                - 'niktoscan' new variables: scanstart, scanend, scanelapsed
         - Ticket 82: Auth is now checked per realm, not per resource
         - Created $mark->{'components'} to store server build items instead of @BUILDITEMS

trunk/docs/nikto.dtd

@@ -38 +38 @@
 <!ATTLIST statistics itemsfound CDATA #IMPLIED>
 <!ATTLIST statistics elapsed CDATA #IMPLIED>
-<!ATTLIST statistics hoststotal CDATA #IMPLIED>
 <!ATTLIST statistics endtime CDATA #IMPLIED>
 

trunk/plugins/nikto_report_html.plugin

@@ -66 +66 @@
     my ($handle, $mark) = @_;
     my $html = html_change_vars($TEMPLATES{'htm_summary'}, $mark);
-    print $handle "$html\n";
+    print $handle $html;
 
-    close($handle);
     return;
 }

trunk/plugins/nikto_report_xml.plugin

@@ -59 +59 @@
     print $handle "$xml\n";
 
-    close($handle);
     return;
 }
@@ -66 +65 @@
     my ($handle, $mark) = @_;
     my $xml = xml_change_vars($TEMPLATES{xml_close}, $mark);
-    print $handle "$xml\n";
+    print $handle $xml;
 
     close($handle);

trunk/templates/xml_close.tmpl

@@ -1 @@
-<statistics hoststotal="#TEMPL_NIKTO_HOSTS_TESTED" />
 </niktoscan>

trunk/templates/xml_start.tmpl

@@ -1 +1 @@
 <?xml version="1.0" ?>
 <!DOCTYPE niktoscan SYSTEM "#NIKTODTD">
-<niktoscan options="#TEMPL_NIKTO_CLI" version="#TEMPL_NIKTO_VER" nxmlversion="1.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.1">

trunk/templates/xml_summary.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.0">