Prevent race in key setup for accelerate daemon
Ensure that initial setup in creating the key directory for ansible accelerate mode keys, and generation/storage of the key for a particular host are completed in a thread safe manner. Creating directories/files and then assigning permissions and contents to them means that paths may exist and satisfy the os.path.exists() method in python for other threads before they are usuable. Use a combination of locking around operations with use of unique named files and an OS file system move to ensure that the conditions of checking whether a file or directory exists, where it is potentially created by another thread, will only succeed when the file has both the correct contents and permissions. Fixes #13850
This commit is contained in:
parent
b24daecd6e
commit
3d4dc206a1
1 changed files with 31 additions and 15 deletions
|
@ -50,6 +50,8 @@ import getpass
|
|||
import sys
|
||||
import subprocess
|
||||
import contextlib
|
||||
import threading
|
||||
import tempfile
|
||||
|
||||
from vault import VaultLib
|
||||
|
||||
|
@ -63,6 +65,7 @@ LOOKUP_REGEX = re.compile(r'lookup\s*\(')
|
|||
PRINT_CODE_REGEX = re.compile(r'(?:{[{%]|[%}]})')
|
||||
CODE_REGEX = re.compile(r'(?:{%|%})')
|
||||
|
||||
_LOCK = threading.Lock()
|
||||
|
||||
try:
|
||||
# simplejson can be much faster if it's available
|
||||
|
@ -128,8 +131,15 @@ def key_for_hostname(hostname):
|
|||
|
||||
key_path = os.path.expanduser(C.ACCELERATE_KEYS_DIR)
|
||||
if not os.path.exists(key_path):
|
||||
os.makedirs(key_path, mode=0700)
|
||||
os.chmod(key_path, int(C.ACCELERATE_KEYS_DIR_PERMS, 8))
|
||||
# avoid race with multiple forks trying to create paths on host
|
||||
# but limit when locking is needed to creation only
|
||||
with(_LOCK):
|
||||
if not os.path.exists(key_path):
|
||||
# use a temp directory and rename to ensure the directory
|
||||
# searched for only appears after permissions applied.
|
||||
tmp_dir = tempfile.mkdtemp(dir=os.path.dirname(key_path))
|
||||
os.chmod(tmp_dir, int(C.ACCELERATE_KEYS_DIR_PERMS, 8))
|
||||
os.rename(tmp_dir, key_path)
|
||||
elif not os.path.isdir(key_path):
|
||||
raise errors.AnsibleError('ACCELERATE_KEYS_DIR is not a directory.')
|
||||
|
||||
|
@ -140,19 +150,25 @@ def key_for_hostname(hostname):
|
|||
|
||||
# use new AES keys every 2 hours, which means fireball must not allow running for longer either
|
||||
if not os.path.exists(key_path) or (time.time() - os.path.getmtime(key_path) > 60*60*2):
|
||||
key = AesKey.Generate(size=256)
|
||||
fd = os.open(key_path, os.O_WRONLY | os.O_CREAT, int(C.ACCELERATE_KEYS_FILE_PERMS, 8))
|
||||
fh = os.fdopen(fd, 'w')
|
||||
fh.write(str(key))
|
||||
fh.close()
|
||||
return key
|
||||
else:
|
||||
if stat.S_IMODE(os.stat(key_path).st_mode) != int(C.ACCELERATE_KEYS_FILE_PERMS, 8):
|
||||
raise errors.AnsibleError('Incorrect permissions on the key file for this host. Use `chmod 0%o %s` to correct this issue.' % (int(C.ACCELERATE_KEYS_FILE_PERMS, 8), key_path))
|
||||
fh = open(key_path)
|
||||
key = AesKey.Read(fh.read())
|
||||
fh.close()
|
||||
return key
|
||||
# avoid race with multiple forks trying to create key
|
||||
# but limit when locking is needed to creation only
|
||||
with(_LOCK):
|
||||
if not os.path.exists(key_path) or (time.time() - os.path.getmtime(key_path) > 60*60*2):
|
||||
key = AesKey.Generate()
|
||||
# use temp file to ensure file only appears once it has
|
||||
# desired contents and permissions
|
||||
with tempfile.NamedTemporaryFile(mode='w', dir=os.path.dirname(key_path), delete=False) as fh:
|
||||
tmp_key_path = fh.name
|
||||
fh.write(str(key))
|
||||
os.chmod(tmp_key_path, int(C.ACCELERATE_KEYS_FILE_PERMS, 8))
|
||||
os.rename(tmp_key_path, key_path)
|
||||
return key
|
||||
|
||||
if stat.S_IMODE(os.stat(key_path).st_mode) != int(C.ACCELERATE_KEYS_FILE_PERMS, 8):
|
||||
raise errors.AnsibleError('Incorrect permissions on the key file for this host. Use `chmod 0%o %s` to correct this issue.' % (int(C.ACCELERATE_KEYS_FILE_PERMS, 8), key_path))
|
||||
|
||||
with open(key_path) as fh:
|
||||
return AesKey.Read(fh.read())
|
||||
|
||||
def encrypt(key, msg):
|
||||
return key.Encrypt(msg.encode('utf-8'))
|
||||
|
|
Loading…
Reference in a new issue