From 2ec6eb5110895c9c08e8cfd04e66f73f6c060f0c Mon Sep 17 00:00:00 2001
From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Mon, 14 Mar 2016 03:41:37 +0000
Subject: [PATCH] Only report unique VHosts in http-apache-server-status. Too
 much output otherwise.

---
 scripts/http-apache-server-status.nse | 20 ++++++++++----------
 scripts/script.db                     |  1 +
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/scripts/http-apache-server-status.nse b/scripts/http-apache-server-status.nse
index 421eba625..3e5126625 100644
--- a/scripts/http-apache-server-status.nse
+++ b/scripts/http-apache-server-status.nse
@@ -30,7 +30,7 @@ References:
 -- |   Server Built:  Jul 24 2015 15:59:00
 -- |   Server Uptime:   53 minutes 31 seconds
 -- |   Server Load:  0.00 0.01 0.05
--- |   Requests: 
+-- |   VHosts:
 -- |_    www.example.com:80  GET /server-status HTTP/1.1
 --
 -- @xmloutput
@@ -39,8 +39,8 @@ References:
 -- <elem key="Server Built">Jul 24 2015 15:59:00</elem>
 -- <elem key="Server Uptime">59 minutes 26 seconds</elem>
 -- <elem key="Server Load">0.01 0.02 0.05</elem>
--- <table key="Requests">
--- <elem>www.example.com:80&#x9;GET /server-status HTTP/1.1</elem>
+-- <table key="VHosts">
+--   <elem>www.example.com:80</elem>
 -- </table>
 
 author = "Eric Gershman"
@@ -78,21 +78,21 @@ action = function(host, port)
   result["Server Uptime"] = string.match(response.body, "Server%suptime:%s*([^<]*)</")
   result["Server Load"] = string.match(response.body, "Server%sload:%s*([^<]*)</")
 
-  result.Requests = {}
+  result.VHosts = {}
   local uniq_requests = {}
 
   -- Parse the Apache client requests into the result table
   for line in string.gmatch(response.body, "<td nowrap>.-</td></tr>") do
     -- skip line if the request is empty
-    if not string.match(line, "<td%snowrap></td><td%snowrap></td></tr>") then  
-      local request = string.match(line, ">([^<]*)</td><td") .. "\t" .. string.match(line, ">([^<]*)</td></tr>")
-      uniq_requests[request] = 1
+    if not string.match(line, "<td%snowrap></td><td%snowrap></td></tr>") then
+      local vhost = string.match(line, ">([^<]*)</td><td")
+      uniq_requests[vhost] = 1
     end
   end
   for request,count in pairs(uniq_requests) do
-    table.insert(result.Requests,request)
-  end 
-  table.sort(result.Requests)
+    table.insert(result.VHosts,request)
+  end
+  table.sort(result.VHosts)
 
   return result
 end
diff --git a/scripts/script.db b/scripts/script.db
index c9a53de94..216492929 100644
--- a/scripts/script.db
+++ b/scripts/script.db
@@ -139,6 +139,7 @@ Entry { filename = "hostmap-robtex.nse", categories = { "discovery", "external",
 Entry { filename = "http-adobe-coldfusion-apsa1301.nse", categories = { "exploit", "vuln", } }
 Entry { filename = "http-affiliate-id.nse", categories = { "discovery", "safe", } }
 Entry { filename = "http-apache-negotiation.nse", categories = { "discovery", "safe", } }
+Entry { filename = "http-apache-server-status.nse", categories = { "discovery", "safe", } }
 Entry { filename = "http-auth-finder.nse", categories = { "discovery", "safe", } }
 Entry { filename = "http-auth.nse", categories = { "auth", "default", "safe", } }
 Entry { filename = "http-avaya-ipoffice-users.nse", categories = { "exploit", "vuln", } }