mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-05-07 13:52:54 +00:00
made accelerate keys directory configurable, and permissions for the file and dir configurable, and gave them a safe default
This commit is contained in:
@@ -87,15 +87,19 @@ def key_for_hostname(hostname):
|
||||
if not KEYCZAR_AVAILABLE:
|
||||
raise errors.AnsibleError("python-keyczar must be installed on the control machine to use accelerated modes")
|
||||
|
||||
key_path = os.path.expanduser("~/.fireball.keys")
|
||||
key_path = os.path.expanduser(C.ACCELERATE_KEYS_DIR)
|
||||
if not os.path.exists(key_path):
|
||||
os.makedirs(key_path)
|
||||
key_path = os.path.expanduser("~/.fireball.keys/%s" % hostname)
|
||||
elif not os.path.isdir(key_path):
|
||||
raise errors.AnsibleError('ACCELERATE_KEYS_DIR is not a directory.')
|
||||
os.chmod(key_path, int(C.ACCELERATE_KEYS_DIR_PERMS, 8))
|
||||
key_path = os.path.join(key_path, 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()
|
||||
fh = open(key_path, "w")
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user