1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-06 04:31:29 +00:00

Remove "hardmatched" argument from calls to nmap.set_port_version.

This is the default and can be omitted. Seeing as the value of this
argument was "hardmatched" in 100% of cases, we're better off pretending
the parameter doesn't exist.
This commit is contained in:
david
2012-07-30 18:58:32 +00:00
parent 453131b820
commit a2c2863531
45 changed files with 50 additions and 50 deletions

View File

@@ -3447,7 +3447,7 @@ action = function(host, port)
-- Detected
port.version.name = "skype2"
port.version.product = "Skype"
nmap.set_port_version(host, port, "hardmatched")
nmap.set_port_version(host, port)
return
end
return

View File

@@ -2012,7 +2012,7 @@ Helper =
-- Give some version info back to Nmap
if ( instance.port and instance.version ) then
instance.version:PopulateNmapPortVersion( instance.port )
--nmap.set_port_version( instance.host, instance.port, "hardmatched" )
--nmap.set_port_version( instance.host, instance.port)
end
end
end
@@ -2030,7 +2030,7 @@ Helper =
-- Give some version info back to Nmap
if ( instance.port and instance.version ) then
instance.version:PopulateNmapPortVersion( instance.port )
nmap.set_port_version( host, instance.port, "hardmatched" )
nmap.set_port_version( host, instance.port)
end
end
@@ -2069,7 +2069,7 @@ Helper =
-- Give some version info back to Nmap
if ( instance.port and instance.version ) then
instance.version:PopulateNmapPortVersion( instance.port )
nmap.set_port_version( host, instance.port, "hardmatched" )
nmap.set_port_version( host, instance.port)
end
end
end

View File

@@ -107,7 +107,7 @@ action = function(host, port)
end
port.version.name = "acarsd"
port.version.product = "ACARS Decoder"
nmap.set_port_version(host, port, "hardmatched")
nmap.set_port_version(host, port)
-- Return results
return stdnse.format_output(true, result)

View File

@@ -56,7 +56,7 @@ action = function(host, port)
port.version.product = cli:getServerProduct()
port.version.extrainfo = cli:getProtocolVersion()
port.version.version = cli:getServerVersion()
nmap.set_port_version(host, port, "hardmatched")
nmap.set_port_version(host, port)
return stdnse.format_output(status, cli:getServerProperties())
end

View File

@@ -229,7 +229,7 @@ local backorifice =
end
self.port.version.hostname = BOhostname
if not self.port.version.ostype then self.port.version.ostype = "Windows" end
nmap.set_port_version(self.host, self.port, "hardmatched")
nmap.set_port_version(self.host, self.port)
nmap.set_port_state(self.host,self.port,"open")
end
}

View File

@@ -253,7 +253,7 @@ local function insert_version_info(host,port,BOversion,BOhostname,initial_seed,p
end
port.version.hostname = BOhostname
if(port.version.ostype == nil) then port.version.ostype = "Windows" end
nmap.set_port_version(host, port, "hardmatched")
nmap.set_port_version(host, port)
nmap.set_port_state(host, port, "open")
end

View File

@@ -140,7 +140,7 @@ action = function(host, port)
if info.version then
port.version.version = decode_bitcoin_version(info.version)
end
nmap.set_port_version(host, port, "hardmatched")
nmap.set_port_version(host, port)
end
end

View File

@@ -135,5 +135,5 @@ function action(host, port)
port.version.name = "cccam"
port.version.version = "CCcam DVR card sharing system"
nmap.set_port_version(host, port, "hardmatched")
nmap.set_port_version(host, port)
end

View File

@@ -88,7 +88,7 @@ action = function(host, port)
-- Here we know it is a couchdb
port.version.name ='httpd'
port.version.product='Apache CouchDB'
nmap.set_port_version(host,port,'hardmatched')
nmap.set_port_version(host,port)
-- We have a valid table in result containing the parsed json
-- now, get all the interesting bits

View File

@@ -107,7 +107,7 @@ action = function(host, port)
-- Here we know it is a couchdb
port.version.name ='httpd'
port.version.product='Apache CouchDB'
nmap.set_port_version(host,port,'hardmatched')
nmap.set_port_version(host,port)
-- We have a valid table in result containing the parsed json
-- now, get all the interesting bits

View File

@@ -423,7 +423,7 @@ action = function(host, port)
port.version.name = "ibm-db2"
port.version.product = "IBM DB2 Database Server"
port.version.name_confidence = 100
nmap.set_port_version(host, port, "hardmatched")
nmap.set_port_version(host, port)
nmap.set_port_state(host, port, "open")
end

View File

@@ -103,7 +103,7 @@ action = function( host, port )
nmap.set_port_state(host, port, "open")
if response.srvclass ~= nil then port.version.extrainfo = response.srvclass end
nmap.set_port_version(host, port, "hardmatched")
nmap.set_port_version(host, port)
-- Generate results
table.insert( results, ("Server Platform: %s"):format( response.srvclass ) )

View File

@@ -50,7 +50,7 @@ action = function( host, port )
if response['status-line'] and response['status-line']:match("200%s+OK") and response['body'] then
port.version.name = "hadoop-datanode"
port.version.product = "Apache Hadoop"
nmap.set_port_version(host, port, "hardmatched")
nmap.set_port_version(host, port)
local body = response['body']:gsub("%%","%%%%")
stdnse.print_debug(2, ("%s: Body %s\n"):format(SCRIPT_NAME,body))
if body:match("([^][\"]+)\">Log") then

View File

@@ -150,7 +150,7 @@ action = function( host, port )
stdnse.print_debug(1, ("%s: Log Files %s"):format(SCRIPT_NAME,logfiles))
table.insert(result, ("Log Files: %s"):format(logfiles))
end
nmap.set_port_version(host, port, "hardmatched")
nmap.set_port_version(host, port)
local tasktrackers = get_tasktrackers (host, port)
if next(tasktrackers) then
table.insert(result, "Tasktrackers: ")

View File

@@ -139,7 +139,7 @@ action = function( host, port )
table.insert(result,"Total\tUsed (DFS)\tUsed (Non DFS)\tRemaining")
table.insert(result, ("%s\t%s\t%s\t%s"):format(capacity[3],capacity[4],capacity[5],capacity[6]))
end
nmap.set_port_version(host, port, "hardmatched")
nmap.set_port_version(host, port)
local datanodes_live = get_datanodes(host,port, "LIVE")
if next(datanodes_live) then
table.insert(result, "Datanodes (Live): ")

View File

@@ -74,7 +74,7 @@ action = function( host, port )
stdnse.print_debug(1, ("%s: Logs %s"):format(SCRIPT_NAME,logs))
table.insert(result, ("Logs: %s"):format(logs))
end
nmap.set_port_version(host, port, "hardmatched")
nmap.set_port_version(host, port)
return stdnse.format_output(true, result)
end
end

View File

@@ -127,7 +127,7 @@ action = function( host, port )
end
end
end
nmap.set_port_version(host, port, "hardmatched")
nmap.set_port_version(host, port)
if next(region_servers) then
table.insert(result,"Region Servers:")
table.insert(result,region_servers)

View File

@@ -90,7 +90,7 @@ action = function( host, port )
end
end
end
nmap.set_port_version(host, port, "hardmatched")
nmap.set_port_version(host, port)
return stdnse.format_output(true, result)
end
end

View File

@@ -120,7 +120,7 @@ including PPPoE credentials, firmware version, model, gateway, dns servers and a
end
if firmware_version and model then
port.version.product = string.format("Huawei aDSL modem %s (%s)", model, firmware_version)
nmap.set_port_version(host, port, "hardmatched")
nmap.set_port_version(host, port)
end
vuln.extra_info = info
return vuln_report:make_output(vuln)

View File

@@ -46,7 +46,7 @@ action = function(host, port)
then
nmap.set_port_state(host, port, "open")
port.version.name = "iax2"
nmap.set_port_version(host, port, "hardmatched")
nmap.set_port_version(host, port)
end
end

View File

@@ -45,7 +45,7 @@ action = function(host, port)
if (string.match(result,"^JDWP%-Handshake\0.*\128") ~= nil) then
port.version.name="jdwp"
port.version.product="unknown"
nmap.set_port_version(host, port, "hardmatched")
nmap.set_port_version(host, port)
end
return
end
@@ -53,6 +53,6 @@ action = function(host, port)
port.version.product = match[1]
port.version.version = match[3]
-- port.version.extrainfo = match[2] .. "\n" .. match[4]
nmap.set_port_version(host, port, "hardmatched")
nmap.set_port_version(host, port)
return
end

View File

@@ -80,7 +80,7 @@ action = function( host, port )
-- set port to open
nmap.set_port_state(host, port, "open")
nmap.set_port_version(host, port, "hardmatched")
nmap.set_port_version(host, port)
return stdnse.format_output(true, result)
end

View File

@@ -170,7 +170,7 @@ action = function(host, port)
port.version.product = "SAP MaxDB"
port.version.version = version_info.VERSION
port.version.ostype = version_info.SYSNAME
nmap.set_port_version(host, port, "hardmatched")
nmap.set_port_version(host, port)
return stdnse.format_output(true, result)
end

View File

@@ -66,7 +66,7 @@ action = function(host, port)
port.version.name = 'http'
port.version.product = 'McAfee ePolicy Orchestrator Agent'
port.version.extrainfo = string.format('ePOServerName: %s, AgentGuid: %s', epoServerName, agentGUID)
nmap.set_port_version(host, port, 'hardmatched')
nmap.set_port_version(host, port)
return nil
end
end

View File

@@ -163,7 +163,7 @@ action = function(host, port)
if ( #results > 0 ) then
port.state = "open"
port.version.name = "modbus"
nmap.set_port_version(host, port, "hardmatched")
nmap.set_port_version(host, port)
end
return stdnse.format_output(true, results)

View File

@@ -88,7 +88,7 @@ function action(host,port)
port.version.name ='mongodb'
port.version.product='MongoDB'
nmap.set_port_version(host,port,'hardmatched')
nmap.set_port_version(host,port)
local output = mongodb.queryResultToTable(result)
if err ~= nil then

View File

@@ -105,7 +105,7 @@ function action(host,port)
port.version.name ='mongodb'
port.version.product='MongoDB'
port.version.name_confidence = 100
nmap.set_port_version(host,port,'hardmatched')
nmap.set_port_version(host,port)
status, packet = mongodb.buildInfoQuery()
if not status then return packet end
@@ -119,7 +119,7 @@ function action(host,port)
local versionNumber = buildQResult['version']
port.version.product='MongoDB '..versionNumber
nmap.set_port_version(host,port,'hardmatched')
nmap.set_port_version(host,port)
local stat_out = mongodb.queryResultToTable(statQResult)
local build_out = mongodb.queryResultToTable(buildQResult)

View File

@@ -222,7 +222,7 @@ local function process_instance( instance )
-- Give some version info back to Nmap
if ( instance.port and instance.version ) then
instance.version:PopulateNmapPortVersion( instance.port )
nmap.set_port_version( instance.host, instance.port, "hardmatched" )
nmap.set_port_version( instance.host, instance.port)
end
end

View File

@@ -31,7 +31,7 @@ action = function(host, port)
if ( status ) then
nmap.set_port_state(host, port, "open")
port.version.name = "nat-pmp"
nmap.set_port_version(host, port, "hardmatched")
nmap.set_port_version(host, port)
return stdnse.format_output(true, ("WAN IP: %s"):format(response.ip))
end

View File

@@ -59,5 +59,5 @@ action = function(host, port)
if ( major and minor and build and smajor and sminor ) then
port.version.extrainfo = port.version.extrainfo .. ("OS ver: %d.%d; OS Build: %d; OS Service Pack: %d"):format(major, minor, build, smajor)
end
nmap.set_port_version(host, port, "hardmatched")
nmap.set_port_version(host, port)
end

View File

@@ -43,7 +43,7 @@ action = function( host, port )
port.version.product = "NetBuster"
port.version.extrainfo = "honeypot"
port.version.version = nil
nmap.set_port_version(host, port, "hardmatched")
nmap.set_port_version(host, port)
return
end

View File

@@ -242,7 +242,7 @@ action = function(host, port)
-- Record service description.
port.version.name = "nrpe"
port.version.product = "Nagios Remote Plugin Executor"
nmap.set_port_version(host, port, "hardmatched")
nmap.set_port_version(host, port)
-- Format table, without trailing newline.
results = tab.dump(results)

View File

@@ -252,7 +252,7 @@ action = function(host, port)
if version then
port.version.version = version
end
nmap.set_port_version(host, port, "hardmatched")
nmap.set_port_version(host, port)
if #options < 1 then
return
end

View File

@@ -43,7 +43,7 @@ local function set_port_version(host, port, version, server)
port.version.extrainfo = string.format("BaseHTTP %s; Python SimpleXMLRPCServer; Python %s", basehttp, python)
end
end
nmap.set_port_version(host, port, "hardmatched")
nmap.set_port_version(host, port)
end
function action(host, port)

View File

@@ -85,7 +85,7 @@ action = function(host, port)
if hostname ~= nil then port.version.hostname = hostname end
port.version.service_tunnel = "none"
nmap.set_port_version(host, port, "hardmatched")
nmap.set_port_version(host, port)
end
end

View File

@@ -238,7 +238,7 @@ action = function(host, port)
if string.find(osline, "win") then
port.version.ostype = "Windows"
end
nmap.set_port_version(host, port, "hardmatched")
nmap.set_port_version(host, port)
end
local fraglimit = fields["fraglimit"]

View File

@@ -98,7 +98,7 @@ local function getservers(host, port, q3protocol)
end
port.version.name = "quake3-master"
nmap.set_port_version(host, port, "hardmatched")
nmap.set_port_version(host, port)
local EOT = bin.pack("ACCC", "EOT", 0, 0, 0)
local pieces = stdnse.strsplit("\\", data)

View File

@@ -212,7 +212,7 @@ function action(host,port, args)
-- It's definitely RMI!
port.version.name ='java-rmi'
port.version.product='Java RMI Registry'
nmap.set_port_version(host,port,'hardmatched')
nmap.set_port_version(host,port)
-- Monkey patch the java-class in rmi, to set our own custom data formatter
-- for classpaths

View File

@@ -63,7 +63,7 @@ local function getInfo(host, port, username, password)
port.version.name = "rpcap"
port.version.product = "WinPcap remote packet capture daemon"
nmap.set_port_version(host, port, "hardmatched")
nmap.set_port_version(host, port)
return true, resp
end

View File

@@ -46,7 +46,7 @@ action = function(host, port)
-- Detected
port.version.name = "skype2"
port.version.product = "Skype"
nmap.set_port_version(host, port, "hardmatched")
nmap.set_port_version(host, port)
return
end
return

View File

@@ -40,7 +40,7 @@ action = function(host, port)
port.version.name = "stun"
nmap.set_port_state(host, port, "open")
nmap.set_port_version(host, port, "hardmatched")
nmap.set_port_version(host, port)
if ( result ) then
return "\n External IP: " .. result

View File

@@ -37,5 +37,5 @@ action = function(host, port)
port.version.name = "stun"
port.version.product = result
nmap.set_port_state(host, port, "open")
nmap.set_port_version(host, port, "hardmatched")
nmap.set_port_version(host, port)
end

View File

@@ -83,7 +83,7 @@ action = function(host, port)
port.version.product = "Versant Database"
port.version.name = "versant"
nmap.set_port_version(host, port, "hardmatched")
nmap.set_port_version(host, port)
-- the script may fail after this part, but we want to report at least
-- the above information if that's the case.

View File

@@ -187,7 +187,7 @@ action = function(host, port)
if (port.version.ostype ~= nil) then
port.version.ostype = "VxWorks " .. info["rt_vers"]
end
nmap.set_port_version(host, port, "hardmatched")
nmap.set_port_version(host, port)
local o = {}
table.insert(o, "VULNERABLE: Wind River Systems VxWorks debug service enabled. See http://www.kb.cert.org/vuls/id/362332")
if (info.agent_ver) then

View File

@@ -386,7 +386,7 @@ local scan = function(host, port, server_name, tls, n)
port.state = "open"
port.version.product = hint
port.version.name_confidence = 100
nmap.set_port_version(host, port, "hardmatched")
nmap.set_port_version(host, port)
end
-- Funny situation: we have a hash of server capabilities list,
@@ -443,7 +443,7 @@ local server_info = function(host, port, id1, id2)
port.version.product = v.name
stdnse.print_debug(" " .. v.name)
port.version.name_confidence = 60
nmap.set_port_version(host, port, "hardmatched")
nmap.set_port_version(host, port)
break
end
end