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

Support checking for su user to atomic_move

Browse source 
Fixes #7553
This commit is contained in:
James Cammarata 2014-05-27 16:04:02 -05:00
parent fa86eef9f9
commit e99df21647
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/module_utils/basic.py
View file

@ -1020,6 +1020,7 @@ class AnsibleModule(object):
context = self.selinux_default_context(dest) context = self.selinux_default_context(dest)
creating = not os.path.exists(dest) creating = not os.path.exists(dest)
switched_user = os.getlogin() != pwd.getpwuid(os.getuid())[0]
try: try:
# Optimistically try a rename, solves some corner cases and can avoid useless work, throws exception if not atomic. # Optimistically try a rename, solves some corner cases and can avoid useless work, throws exception if not atomic.
@ -1035,7 +1036,7 @@ class AnsibleModule(object):
prefix=".ansible_tmp", dir=dest_dir, suffix=dest_file) prefix=".ansible_tmp", dir=dest_dir, suffix=dest_file)
try: # leaves tmp file behind when sudo and not root try: # leaves tmp file behind when sudo and not root
if os.getenv("SUDO_USER") and os.getuid() != 0: if switched_user and os.getuid() != 0:
# cleanup will happen by 'rm' of tempdir # cleanup will happen by 'rm' of tempdir
# copy2 will preserve some metadata # copy2 will preserve some metadata
shutil.copy2(src, tmp_dest.name) shutil.copy2(src, tmp_dest.name)
@ -1058,7 +1059,7 @@ class AnsibleModule(object):
umask = os.umask(0) umask = os.umask(0)
os.umask(umask) os.umask(umask)
os.chmod(dest, 0666 ^ umask) os.chmod(dest, 0666 ^ umask)
if os.getenv("SUDO_USER"): if switched_user:
os.chown(dest, os.getuid(), os.getgid()) os.chown(dest, os.getuid(), os.getgid())
if self.selinux_enabled(): if self.selinux_enabled():