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

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

Browse source 
* 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)
This commit is contained in:
Toshio Kuratomi 2016-08-04 16:35:36 -07:00 committed by Toshio Kuratomi
parent 9f645cdbdb
commit 7bd9128848
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/ansible/constants.py
View file

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

2
lib/ansible/utils/path.py
View file

@ -30,7 +30,7 @@ def unfrackpath(path):
example: example:
'$HOME/../../var/mail' becomes '/var/spool/mail' '$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): def makedirs_safe(path, mode=None):
'''Safe way to create dirs in muliprocess/thread environments''' '''Safe way to create dirs in muliprocess/thread environments'''