Changeset 78

Timestamp:

09/20/2008 04:31:59 PM (5 years ago)

Author:

deity

Message:

Fix for ticket #59

Location:

trunk

Files:

• docs/CHANGES.txt (modified) (1 diff)
• docs/nikto.dtd (modified) (1 diff)
• plugins/nikto_reports.plugin (modified) (1 diff)
• templates/xml_host_head.tmpl (modified) (1 diff)

trunk/docs/CHANGES.txt

@@ -1 +1 @@
 2008-09-20 plugins/nikto_core.plugin plugins/nikto_cgi.plugin nikto.pl
+           plugins/nikto_reports.plugin templates/xml_host_head.tmpl
+           docs/nikto.dtd
         - Fixes to ensure nikto produces less perl warnings
+        - Fix for ticket #59: add vhost to xml output
 2008-09-16 plugins/nikto_core.plugin plugins/nikto_httpoptions.plugin
         - Fix for ticket #37

trunk/docs/nikto.dtd

@@ -17 +17 @@
 <!ATTLIST scandetails itemstested CDATA #REQUIRED>
 <!ATTLIST scandetails itemsfound CDATA #REQUIRED>
+<!ATTLIST scandetails hostheader CDATA>
 
 <!ELEMENT item (description,uri?,namelink?,iplink?)>

trunk/plugins/nikto_reports.plugin

@@ -117 +117 @@
     $variables{"#TEMPL_END"}                = $TARGETS{$CURRENT_HOST_ID}{ports}{$CURRENT_PORT}{stop_time_disp};
     $variables{"#TEMPL_HOSTNAME"}           = simple_enc($TARGETS{$CURRENT_HOST_ID}{hostname});
+    $variables{"#TEMPL_HOST_HEADER"}        = $TARGETS{$CURRENT_HOST_ID}{hostname};
+    if (defined $TARGETS{$CURRENT_HOST_ID}{vhost})
+    {
+       $variables{"#TEMPL_HOST_HEADER"}     = $TARGETS{$CURRENT_HOST_ID}{vhost};
+    }
     $variables{"#TEMPL_IP"}                 = simple_enc($TARGETS{$CURRENT_HOST_ID}{ip});
     $variables{"#TEMPL_ITEMS_TESTED"}       = $TARGETS{$CURRENT_HOST_ID}{total_checks};

trunk/templates/xml_host_head.tmpl

@@ -1 @@
-<scandetails targetip="#TEMPL_IP" targethostname="#TEMPL_HOSTNAME" targetport="#TEMPL_PORT" targetbanner="#TEMPL_BANNER" starttime="#TEMPL_START" endtime="#TEMPL_END" elasped="#TEMPL_ELAPSED" sitename="#TEMPL_LINK_NAME" siteip="#TEMPL_LINK_IP" itemstested="#TEMPL_ITEMS_TESTED" itemsfound="#TEMPL_ITEMS_FOUND">
+<scandetails targetip="#TEMPL_IP" targethostname="#TEMPL_HOSTNAME" targetport="#TEMPL_PORT" targetbanner="#TEMPL_BANNER" starttime="#TEMPL_START" endtime="#TEMPL_END" elasped="#TEMPL_ELAPSED" sitename="#TEMPL_LINK_NAME" siteip="#TEMPL_LINK_IP" itemstested="#TEMPL_ITEMS_TESTED" itemsfound="#TEMPL_ITEMS_FOUND" hostheader="#TMPL_HOST_HEADER">