module_utils/atomic_move(): Use tempfile module

Fix a potential race condition by using the tempfile module.
pull/6593/head
Till Maas 11 years ago
parent 8f778a83df
commit 898a38b074

@ -55,6 +55,7 @@ import types
import time import time
import shutil import shutil
import stat import stat
import tempfile
import traceback import traceback
import grp import grp
import pwd import pwd
@ -972,24 +973,25 @@ class AnsibleModule(object):
dest_dir = os.path.dirname(dest) dest_dir = os.path.dirname(dest)
dest_file = os.path.basename(dest) dest_file = os.path.basename(dest)
tmp_dest = "%s/.%s.%s.%s" % (dest_dir,dest_file,os.getpid(),time.time()) tmp_dest = tempfile.NamedTemporaryFile(
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 os.getenv("SUDO_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) shutil.copy2(src, tmp_dest.name)
else: else:
shutil.move(src, tmp_dest) shutil.move(src, tmp_dest.name)
if self.selinux_enabled(): if self.selinux_enabled():
self.set_context_if_different( self.set_context_if_different(
tmp_dest, context, False) tmp_dest.name, context, False)
# Reset owners, they are not preserved by shutil.copy2(), which # Reset owners, they are not preserved by shutil.copy2(), which
# is what shutil.move() falls back to. # is what shutil.move() falls back to.
os.chown(tmp_dest, st.st_uid, st.st_gid) os.chown(tmp_dest.name, st.st_uid, st.st_gid)
os.rename(tmp_dest, dest) os.rename(tmp_dest.name, dest)
except (shutil.Error, OSError, IOError), e: except (shutil.Error, OSError, IOError), e:
self.cleanup(tmp_dest) self.cleanup(tmp_dest.name)
self.fail_json(msg='Could not replace file: %s to %s: %s' % (src, dest, e)) self.fail_json(msg='Could not replace file: %s to %s: %s' % (src, dest, e))
if self.selinux_enabled(): if self.selinux_enabled():

Loading…
Cancel
Save