Skip to content

Commit

Permalink
ensure local exposes correct user (#72543)
Browse files Browse the repository at this point in the history
* ensure local exposes correct user

  avoid corner case in which delegation relied on
  playcontext fallback which was removed

  fixes #72541
  • Loading branch information
bcoca committed Nov 9, 2020
1 parent de5858f commit aa4d53c
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 2 deletions.
2 changes: 2 additions & 0 deletions changelogs/fragments/ensure_local_user_correctness.yml
@@ -0,0 +1,2 @@
bugfixes:
- ensure 'local' connection always has the correct default user for actions to consume.
3 changes: 2 additions & 1 deletion lib/ansible/plugins/connection/local.py
Expand Up @@ -44,13 +44,14 @@ def __init__(self, *args, **kwargs):

super(Connection, self).__init__(*args, **kwargs)
self.cwd = None
self.default_user = getpass.getuser()

def _connect(self):
''' connect to the local host; nothing to do here '''

# Because we haven't made any remote connection we're running as
# the local user, rather than as whatever is configured in remote_user.
self._play_context.remote_user = getpass.getuser()
self._play_context.remote_user = self.default_user

if not self._connected:
display.vvv(u"ESTABLISH LOCAL CONNECTION FOR USER: {0}".format(self._play_context.remote_user), host=self._play_context.remote_addr)
Expand Down
10 changes: 10 additions & 0 deletions test/integration/targets/delegate_to/delegate_local_from_root.yml
@@ -0,0 +1,10 @@
- name: handle case from issue 72541
hosts: testhost
gather_facts: false
remote_user: root
tasks:
- name: ensure we copy w/o errors due to remote user not being overriden
copy:
src: testfile
dest: "{{ playbook_dir }}"
delegate_to: localhost
1 change: 1 addition & 0 deletions test/integration/targets/delegate_to/files/testfile
@@ -0,0 +1 @@
nothing special
3 changes: 2 additions & 1 deletion test/integration/targets/delegate_to/runme.sh
Expand Up @@ -72,4 +72,5 @@ ln -s python secondpython
ansible-playbook verify_interpreter.yml -i inventory_interpreters -v "$@"
ansible-playbook discovery_applied.yml -i inventory -v "$@"
ansible-playbook resolve_vars.yml -i inventory -v "$@"
ansible-playbook test_delegate_to_lookup_context.yml -i inventory -v "$@"
ansible-playbook test_delegate_to_lookup_context.yml -i inventory -v "$@"
ansible-playbook delegate_local_from_root.yml -i inventory -v "$@" -e 'ansible_user=root'

0 comments on commit aa4d53c

Please sign in to comment.