* Fix race in creating temp directories pre-fork (#16965)

* These can still race when multiple ansible processes are created at
    the same time.
* Reverse order of expanduser and expandvars in unfrakpath(). So that
  tildes in environment variables will be handled.
(cherry picked from commit 1ecf51d87e)
pull/17045/head
Toshio Kuratomi 8 years ago committed by Toshio Kuratomi
parent 9f645cdbdb
commit 7bd9128848

@ -28,6 +28,7 @@ from ansible.compat.six.moves import configparser
from ansible.parsing.quoting import unquote
from ansible.errors import AnsibleOptionsError
from ansible.utils.path import makedirs_safe
# copied from utils, avoid circular reference fun :)
def mk_boolean(value):
@ -75,7 +76,7 @@ def get_config(p, section, key, env_var, default, boolean=False, integer=False,
elif istmppath:
value = shell_expand(value)
if not os.path.exists(value):
os.makedirs(value, 0o700)
makedirs_safe(value, 0o700)
prefix = 'ansible-local-%s' % os.getpid()
value = tempfile.mkdtemp(prefix=prefix, dir=value)
elif ispathlist:

@ -30,7 +30,7 @@ def unfrackpath(path):
example:
'$HOME/../../var/mail' becomes '/var/spool/mail'
'''
return os.path.normpath(os.path.realpath(os.path.expandvars(os.path.expanduser(path))))
return os.path.normpath(os.path.realpath(os.path.expanduser(os.path.expandvars(path))))
def makedirs_safe(path, mode=None):
'''Safe way to create dirs in muliprocess/thread environments'''

Loading…
Cancel
Save