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

Allow newlines to separate script-args

Browse Source 
This was previously done for --script-args-file with a blind gsub of all
newlines with commas (","), which meant that quoted strings could not
contain newlines. Now they can.
This commit is contained in:
dmiller
2016-01-14 21:08:29 +00:00
parent 97163a3052
commit f8be8feade
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
nse_main.lua
View File

@@ -1165,7 +1165,7 @@ do
local t, path = cnse.fetchfile_absolute(cnse.scriptargsfile) local t, path = cnse.fetchfile_absolute(cnse.scriptargsfile)
assert(t == 'file', format("%s is not a file", path)) assert(t == 'file', format("%s is not a file", path))
print_debug(1, "Loading script-args from file `%s'", cnse.scriptargsfile); print_debug(1, "Loading script-args from file `%s'", cnse.scriptargsfile);
args[#args+1] = assert(assert(open(path, 'r')):read "*a"):gsub("\n", ","):gsub(",*$", ""); args[#args+1] = assert(assert(open(path, 'r')):read "*a"):gsub(",*$", "");
end end
if cnse.scriptargs then -- Load script arguments (--script-args) if cnse.scriptargs then -- Load script arguments (--script-args)
@@ -1187,15 +1187,17 @@ do
local parser = locale { local parser = locale {
V "space"^0 * V "table" * V "space"^0, V "space"^0 * V "table" * V "space"^0,
table = Cf(Ct "" * P "{" * V "space"^0 * (V "fieldlst")^-1 * V "space"^0 * P "}", set); table = Cf(Ct "" * P "{" * V "space"^0 * (V "fieldlst")^-1 * V "space"^0 * P "}", set);
fieldlst = V "field" * (V "space"^0 * P "," * V "space"^0 * V "field")^0; hws = V "space" - P "\n", -- horizontal whitespace
fieldlst = V "field" * (V "hws"^0 * S "\n," * V "space"^0 * V "field")^0;
field = V "kv" + V "av"; field = V "kv" + V "av";
kv = Cg(V "string" * V "space"^0 * P "=" * V "space"^0 * V "value"); kv = Cg(V "string" * V "hws"^0 * P "=" * V "hws"^0 * V "value");
av = Cg(V "value"); av = Cg(V "value");
value = V "table" + V "string"; value = V "table" + V "string";
string = V "qstring" + V "uqstring"; string = V "qstring" + V "uqstring";
qstring = U.escaped_quote('"') + U.escaped_quote("'"); qstring = U.escaped_quote('"') + U.escaped_quote("'");
uqstring = V "space"^0 * C((P(1) - V "space"^0 * S ",{}=")^0) * V "space"^0; -- everything but ',{}=', do not capture final space uqstring = V "hws"^0 * C((P(1) - V "hws"^0 * S "\n,{}=")^0) * V "hws"^0; -- everything but '\n,{}=', do not capture final space
}; };
--U.debug(parser,function(...)return print_debug(1,...)end)
parser = assert(P(parser)); parser = assert(P(parser));
nmap.registry.args = parser:match("{"..args.."}"); nmap.registry.args = parser:match("{"..args.."}");
if not nmap.registry.args then if not nmap.registry.args then