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

set the play_context connection_user before mapping magic variables (#28599)

Browse source 
This change moves when the connection_user is set in the play_context to
set it before the magic variables are mapped.  If the connection_user
is not set before the mapping, the connection_user will be incorrectly set
for local connections

fixes #26120
This commit is contained in:
Peter Sprygada 2017-08-24 14:49:42 -04:00 committed by GitHub
parent fc7301671e
commit ac6892efe4
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/playbook/play_context.py
View file

@ -432,6 +432,11 @@ class PlayContext(Base):
if exe_var in variables:
setattr(new_info, 'executable', variables.get(exe_var))
# we store original in 'connection_user' for use of network/other modules that fallback to it as login user
# this needs to be done before the MAGIC_VARIABLE_MAPPING happens below
if new_info.connection == 'local':
new_info.connection_user = new_info.remote_user
attrs_considered = []
for (attr, variable_names) in iteritems(MAGIC_VARIABLE_MAPPING):
for variable_name in variable_names:
@ -493,9 +498,7 @@ class PlayContext(Base):
# if the final connection type is local, reset the remote_user value to that of the currently logged in user
# this ensures any become settings are obeyed correctly
# we store original in 'connection_user' for use of network/other modules that fallback to it as login user
if new_info.connection == 'local':
new_info.connection_user = new_info.remote_user
new_info.remote_user = pwd.getpwuid(os.getuid()).pw_name
# set no_log to default if it was not previouslly set