PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-06 04:31:29 +00:00
Code Issues Projects Releases Wiki Activity

Fix usage of nmap.fetchfile in several scripts

Browse Source 
Discussion thread: http://seclists.org/nmap-dev/2013/q2/121

Existing behavior preserved and preferred, but absolute and local paths
should also work now. Notably, smb-psexec's locate_file function claimed
to check current directory but did not.
This commit is contained in:
dmiller
2013-04-26 12:14:44 +00:00
parent 666de7b83f
commit 93eee124c2
5 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
scripts/smb-psexec.nse
View File

@@ -521,24 +521,31 @@ local function locate_file(filename, extension)
extension = extension or ""
local filename_full = nmap.fetchfile(filename)
if(filename_full == nil) then
filename_full = nmap.fetchfile(filename .. "." .. extension)
local filename_full = nmap.fetchfile(filename) or nmap.fetchfile(filename .. "." .. extension)
if(filename_full == nil) then
filename = "nselib/data/psexec/" .. filename
filename_full = nmap.fetchfile(filename)
if(filename_full == nil) then
local psexecfile = "nselib/data/psexec/" .. filename
filename_full = nmap.fetchfile(psexecfile) or nmap.fetchfile(psexecfile .. "." .. extension)
end
if(filename_full == nil) then
filename_full = nmap.fetchfile(filename .. "." .. extension)
end
end
end
-- Die if we couldn't find the file
if(filename_full == nil) then
return nil
end
-- check for absolute path or relative to current directory
if(filename_full == nil) then
f, err = io.open(filename, "rb")
if f == nil then
stdnse.print_debug(1, "%s: Error opening %s: %s", SCRIPT_NAME, filename, err)
f, err = io.open(filename .. "." .. extension, "rb")
if f == nil then
stdnse.print_debug(1, "%s: Error opening %s.%s: %s", SCRIPT_NAME, filename, extension, err)
return nil -- unnecessary, but explicit
else
f:close()
return filename .. "." .. extension
end
else
f:close()
return filename
end
end
return filename_full
end