PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-17 21:19:01 +00:00
Code Issues Projects Releases Wiki Activity

Miscellaneous code clean-up

Browse Source
This commit is contained in:
nnposter
2018-07-15 23:42:31 +00:00
parent 78601bc7c3
commit ece05c34ee
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
scripts/http-default-accounts.nse
View File

@@ -169,7 +169,13 @@ local function validate_fingerprints(fingerprints)
end end
end end
-- simplify unlocking the mutex, ensuring we don't try to parse again, and returning an error. -- Simplify unlocking the mutex, ensuring we don't try to load the fingerprints
-- again by storing and returning an error message in place of the cached
-- fingerprints.
-- @param mutex Mutex that controls fingerprint loading
-- @param err Error message
-- @return Status (always false)
-- @return Error message passed in
local function bad_prints(mutex, err) local function bad_prints(mutex, err)
nmap.registry.http_default_accounts_fingerprints = err nmap.registry.http_default_accounts_fingerprints = err
mutex "done" mutex "done"
@@ -177,12 +183,12 @@ local function bad_prints(mutex, err)
end end
--- ---
-- load_fingerprints(filename, category) -- Loads data from file and returns table of fingerprints if sanity checks are
-- Loads data from file and returns table of fingerprints if sanity checks are passed -- passed
-- Based on http-enum's load_fingerprints()
-- @param filename Fingerprint filename -- @param filename Fingerprint filename
-- @param cat Category of fingerprints to use -- @param cat Category of fingerprints to use
-- @return Table of fingerprints -- @return Status (true or false)
-- @return Table of fingerprints (or an error message)
--- ---
local function load_fingerprints(filename, cat) local function load_fingerprints(filename, cat)
local file, filename_full, fingerprints local file, filename_full, fingerprints
@@ -312,7 +318,6 @@ end
action = function(host, port) action = function(host, port)
local fingerprintload_status, status, fingerprints, pathmap, requests, results
local fingerprint_filename = stdnse.get_script_args("http-default-accounts.fingerprintfile") or "http-default-accounts-fingerprints.lua" local fingerprint_filename = stdnse.get_script_args("http-default-accounts.fingerprintfile") or "http-default-accounts-fingerprints.lua"
local category = stdnse.get_script_args("http-default-accounts.category") or false local category = stdnse.get_script_args("http-default-accounts.category") or false
local basepath = stdnse.get_script_args("http-default-accounts.basepath") or "/" local basepath = stdnse.get_script_args("http-default-accounts.basepath") or "/"
@@ -331,7 +336,7 @@ action = function(host, port)
end end
--Load fingerprint data or abort --Load fingerprint data or abort
status, fingerprints = load_fingerprints(fingerprint_filename, category) local status, fingerprints = load_fingerprints(fingerprint_filename, category)
if(not(status)) then if(not(status)) then
return stdnse.format_output(false, fingerprints) return stdnse.format_output(false, fingerprints)
end end
@@ -341,8 +346,8 @@ action = function(host, port)
basepath = format_basepath(basepath) basepath = format_basepath(basepath)
-- Add requests to the http pipeline -- Add requests to the http pipeline
pathmap = {} local pathmap = {}
requests = nil local requests = nil
stdnse.debug(1, "Trying known locations under path '%s' (change with '%s.basepath' argument)", basepath, SCRIPT_NAME) stdnse.debug(1, "Trying known locations under path '%s' (change with '%s.basepath' argument)", basepath, SCRIPT_NAME)
for _, fingerprint in ipairs(fingerprints) do for _, fingerprint in ipairs(fingerprints) do
for _, probe in ipairs(fingerprint.paths) do for _, probe in ipairs(fingerprint.paths) do
@@ -360,7 +365,7 @@ action = function(host, port)
end end
-- Nuclear launch detected! -- Nuclear launch detected!
results = http.pipeline_go(host, port, requests) local results = http.pipeline_go(host, port, requests)
if results == nil then if results == nil then
return stdnse.format_output(false, return stdnse.format_output(false,
"HTTP request table is empty. This should not happen since we at least made one request.") "HTTP request table is empty. This should not happen since we at least made one request.")