Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

synchronize: fix to honor become_user when become_method sudo #187

Merged
merged 3 commits into from
Jul 8, 2021
Merged

synchronize: fix to honor become_user when become_method sudo #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b41ce1
Fix to honor become_user in synchronize module (Fixes #186)
smemsh May 12, 2021
0e6f8ab
Modify synchronize tests for '-u root' arg when become_user not supplied
smemsh May 12, 2021
6e60b0d
Add changelog fragment for synchronize become_user fix
smemsh May 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions changelogs/fragments/187-fix-synchronize-become-user.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
bugfixes:
- synchronize - use become_user when invoking rsync on remote with sudo
(https://github.com/ansible-collections/ansible.posix/issues/186).
5 changes: 4 additions & 1 deletion plugins/action/synchronize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,10 @@ def run(self, tmp=None, task_vars=None):
# If no rsync_path is set, become was originally set, and dest is
# remote then add privilege escalation here.
if self._play_context.become_method == 'sudo':
rsync_path = 'sudo rsync'
if self._play_context.become_user:
rsync_path = 'sudo -u %s rsync' % self._play_context.become_user
else:
rsync_path = 'sudo rsync'
# TODO: have to add in the rest of the become methods here

# We cannot use privilege escalation on the machine running the
Expand Down
3 changes: 2 additions & 1 deletion tests/unit/plugins/action/fixtures/synchronize/basic_become/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ asserts:
- "self.execute_called"
- "self.final_module_args['_local_rsync_path'] == 'rsync'"
# this is a crucial aspect of this scenario ...
- "self.final_module_args['rsync_path'] == 'sudo rsync'"
# note: become_user None -> root
- "self.final_module_args['rsync_path'] == 'sudo -u root rsync'"
- "self.final_module_args['src'] == '/tmp/deleteme'"
- "self.final_module_args['dest'] == 'root@el6host:/tmp/deleteme'"
- "self.task.become == True"
Expand Down
3 changes: 2 additions & 1 deletion tests/unit/plugins/action/fixtures/synchronize/basic_become_cli/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ asserts:
- "self.execute_called"
- "self.final_module_args['_local_rsync_path'] == 'rsync'"
# this is a crucial aspect of this scenario ...
- "self.final_module_args['rsync_path'] == 'sudo rsync'"
# note: become_user None -> root
- "self.final_module_args['rsync_path'] == 'sudo -u root rsync'"
- "self.final_module_args['src'] == '/tmp/deleteme'"
- "self.final_module_args['dest'] == 'root@el6host:/tmp/deleteme'"
- "self.task.become == None"
Expand Down