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

Fix regression: Sanitize sudo success_key from stdout

Browse source 
Commit 7e3dd10 caused a regression with sanitizing the sudo success_key from stdout.
There is no newline in front of SUDO-SUCCESS when using sudo.
This change adapts the regex to make the line break optional.

Tested on Ubuntu 14.04.
This commit is contained in:
Felix Geyer 2014-07-16 18:14:35 +02:00
parent 616d749ab3
commit 0ebd19e97b
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/runner/action_plugins/raw.py
View file

@ -49,6 +49,6 @@ class ActionModule(object):
# may leak into the stdout due to the way the sudo/su # may leak into the stdout due to the way the sudo/su
# command is constructed, so we filter that out here # command is constructed, so we filter that out here
if result.get('stdout','').strip().startswith('SUDO-SUCCESS-'): if result.get('stdout','').strip().startswith('SUDO-SUCCESS-'):
result['stdout'] = re.sub(r'^(\r)?\nSUDO-SUCCESS.*(\r)?\n', '', result['stdout']) result['stdout'] = re.sub(r'^((\r)?\n)?SUDO-SUCCESS.*(\r)?\n', '', result['stdout'])
return ReturnData(conn=conn, result=result) return ReturnData(conn=conn, result=result)