From 327e0ab4cd32fc27899e33c557f2804c3ea8d9ed Mon Sep 17 00:00:00 2001 From: dmiller Date: Wed, 3 Sep 2014 22:07:31 +0000 Subject: [PATCH] Update hbase-master-info with XML output --- scripts/hbase-master-info.nse | 143 ++++++++++++++++++---------------- 1 file changed, 77 insertions(+), 66 deletions(-) diff --git a/scripts/hbase-master-info.nse b/scripts/hbase-master-info.nse index a14cd6f8e..9f29d1b61 100644 --- a/scripts/hbase-master-info.nse +++ b/scripts/hbase-master-info.nse @@ -41,7 +41,18 @@ For more information about Hbase, see: -- | Region Servers: -- | region1.example.com:60030 -- |_ region2.example.com:60030 ---- +-- @xmloutput +-- 0.90.1 +-- Wed May 11 22:33:44 PDT 2011, bob +-- hdfs://master.example.com:8020/hbase +-- 0.20 f415ef415ef415ef415ef415ef415ef415ef415e +-- Wed May 11 22:33:44 PDT 2011, bob +-- 0.12 +-- zookeeper.example.com:2181 +-- +-- region1.example.com:60030 +-- region2.example.com:60030 +--
author = "John R. Bond" @@ -58,82 +69,82 @@ end action = function( host, port ) - local result = {} + local result = stdnse.output_table() local region_servers = {} local uri = "/master.jsp" stdnse.debug1("HTTP GET %s:%s%s", host.targetname or host.ip, port.number, uri) local response = http.get( host, port, uri ) stdnse.debug1("Status %s",response['status-line'] or "No Response") - if response['status-line'] and response['status-line']:match("200%s+OK") and response['body'] then - local body = response['body']:gsub("%%","%%%%") - stdnse.debug2("Body %s\n",body) - if body:match("HBase%s+Version([^][<]+)") then - local version = body:match("HBase%s+Version([^][<]+)"):gsub("%s+", " ") - stdnse.debug1("Hbase Version %s",version) - table.insert(result, ("Hbase Version: %s"):format(version)) - port.version.version = version + if not (response['status-line'] and response['status-line']:match("200%s+OK") and response['body']) then + return nil + end + local body = response['body']:gsub("%%","%%%%") + stdnse.debug2("Body %s\n",body) + if body:match("HBase%s+Version([^][<]+)") then + local version = body:match("HBase%s+Version([^][<]+)"):gsub("%s+", " ") + stdnse.debug1("Hbase Version %s",version) + result["Hbase Version"] = version + port.version.version = version + end + if body:match("HBase%s+Compiled([^][<]+)") then + local compiled = body:match("HBase%s+Compiled([^][<]+)"):gsub("%s+", " ") + stdnse.debug1("Hbase Compiled %s",compiled) + result["Hbase Compiled"] = compiled + end + if body:match("Directory([^][<]+)") then + local compiled = body:match("Directory([^][<]+)"):gsub("%s+", " ") + stdnse.debug1("HBase RootDirectory %s",compiled) + result["HBase Root Directory"] = compiled + end + if body:match("Hadoop%s+Version([^][<]+)") then + local version = body:match("Hadoop%s+Version([^][<]+)"):gsub("%s+", " ") + stdnse.debug1("Hadoop Version %s",version) + result["Hadoop Version"] = version + end + if body:match("Hadoop%s+Compiled([^][<]+)") then + local compiled = body:match("Hadoop%s+Compiled([^][<]+)"):gsub("%s+", " ") + stdnse.debug1("Hadoop Compiled %s",compiled) + result["Hadoop Compiled"] = compiled + end + if body:match("average([^][<]+)") then + local average = body:match("average([^][<]+)"):gsub("%s+", " ") + stdnse.debug1("Average Load %s",average) + result["Average Load"] = average + end + if body:match("Quorum([^][<]+)") then + local quorum = body:match("Quorum([^][<]+)"):gsub("%s+", " ") + stdnse.debug1("Zookeeper Quorum %s",quorum) + result["Zookeeper Quorum"] = quorum + if target.ALLOW_NEW_TARGETS then + if quorum:match("([%w%.]+)") then + local newtarget = quorum:match("([%w%.]+)") + stdnse.debug1("Added target: %s", newtarget) + local status,err = target.add(newtarget) + end end - if body:match("HBase%s+Compiled([^][<]+)") then - local compiled = body:match("HBase%s+Compiled([^][<]+)"):gsub("%s+", " ") - stdnse.debug1("Hbase Compiled %s",compiled) - table.insert(result, ("Hbase Compiled: %s"):format(compiled)) - end - if body:match("Directory([^][<]+)") then - local compiled = body:match("Directory([^][<]+)"):gsub("%s+", " ") - stdnse.debug1("HBase RootDirectory %s",compiled) - table.insert(result, ("HBase Root Directory: %s"):format(compiled)) - end - if body:match("Hadoop%s+Version([^][<]+)") then - local version = body:match("Hadoop%s+Version([^][<]+)"):gsub("%s+", " ") - stdnse.debug1("Hadoop Version %s",version) - table.insert(result, ("Hadoop Version: %s"):format(version)) - end - if body:match("Hadoop%s+Compiled([^][<]+)") then - local compiled = body:match("Hadoop%s+Compiled([^][<]+)"):gsub("%s+", " ") - stdnse.debug1("Hadoop Compiled %s",compiled) - table.insert(result, ("Hadoop Compiled: %s"):format(compiled)) - end - if body:match("average([^][<]+)") then - local average = body:match("average([^][<]+)"):gsub("%s+", " ") - stdnse.debug1("Average Load %s",average) - table.insert(result, ("Average Load: %s"):format(average)) - end - if body:match("Quorum([^][<]+)") then - local quorum = body:match("Quorum([^][<]+)"):gsub("%s+", " ") - stdnse.debug1("Zookeeper Quorum %s",quorum) - table.insert(result, ("Zookeeper Quorum: %s"):format(quorum)) + end + for line in string.gmatch(body, "[^\n]+") do + stdnse.debug3("Line %s\n",line) + if line:match("maxHeap") then + local region_server= line:match("\">([^][<]+)") + stdnse.debug1("Region Server %s",region_server) + table.insert(region_servers, region_server) if target.ALLOW_NEW_TARGETS then - if quorum:match("([%w%.]+)") then - local newtarget = quorum:match("([%w%.]+)") + if region_server:match("([%w%.]+)") then + local newtarget = region_server:match("([%w%.]+)") stdnse.debug1("Added target: %s", newtarget) local status,err = target.add(newtarget) end end end - for line in string.gmatch(body, "[^\n]+") do - stdnse.debug3("Line %s\n",line) - if line:match("maxHeap") then - local region_server= line:match("\">([^][<]+)") - stdnse.debug1("Region Server %s",region_server) - table.insert(region_servers, region_server) - if target.ALLOW_NEW_TARGETS then - if region_server:match("([%w%.]+)") then - local newtarget = region_server:match("([%w%.]+)") - stdnse.debug1("Added target: %s", newtarget) - local status,err = target.add(newtarget) - end - end - end - end - if next(region_servers) then - table.insert(result,"Region Servers:") - table.insert(result,region_servers) - end - if #result > 0 then - port.version.name = "hbase-master" - port.version.product = "Apache Hadoop Hbase" - nmap.set_port_version(host, port) - end - return stdnse.format_output(true, result) end + if next(region_servers) then + result["Region Servers"] = region_servers + end + if #result > 0 then + port.version.name = "hbase-master" + port.version.product = "Apache Hadoop Hbase" + nmap.set_port_version(host, port) + end + return result end