cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixes for module param counting and additional shell quoting issues

Browse source
This commit is contained in:
James Cammarata 2014-07-23 21:37:57 -05:00
parent cf8905b2b0
commit 0bf0053652
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
commands/command
View file

@ -213,16 +213,21 @@ class CommandModule(AnsibleModule):
# use shlex to split up the args, while being careful to preserve # use shlex to split up the args, while being careful to preserve
# single quotes so they're not removed accidentally # single quotes so they're not removed accidentally
lexer = shlex.shlex(args, posix=True) lexer = shlex.shlex(args)
lexer.whitespace = '\t '
lexer.whitespace_split = True lexer.whitespace_split = True
lexer.quotes = '"'
lexer.ignore_quotes = "'"
items = list(lexer) items = list(lexer)
for x in items: for x in items:
if '=' in x: quoted = x.startswith('"') and x.endswith('"') or x.startswith("'") and x.endswith("'")
if '=' in x and not quoted:
# check to see if this is a special parameter for the command # check to see if this is a special parameter for the command
k, v = x.split('=', 1) k, v = x.split('=', 1)
# because we're not breaking out quotes in the shlex split
# above, the value of the k=v pair may still be quoted. If
# so, remove them.
if len(v) > 1 and (v.startswith('"') and v.endswith('"') or v.startswith("'") and v.endswith("'")):
v = v[1:-1]
if k in ('creates', 'removes', 'chdir', 'executable', 'NO_LOG'): if k in ('creates', 'removes', 'chdir', 'executable', 'NO_LOG'):
if k == "chdir": if k == "chdir":
v = os.path.abspath(os.path.expanduser(v)) v = os.path.abspath(os.path.expanduser(v))
@ -235,7 +240,7 @@ class CommandModule(AnsibleModule):
params[k] = v params[k] = v
# Remove any of the above k=v params from the args string # Remove any of the above k=v params from the args string
args = PARAM_REGEX.sub('', args) args = PARAM_REGEX.sub('', args)
params['args'] = args params['args'] = args.strip()
return (params, params['args']) return (params, params['args'])
main() main()