External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-08 01:47:35 -02:30
Code Issues Packages Projects Releases Wiki Activity

Write SSH key data to a named pipe and remove immediately after reading to avoid leaving private key data on disk.

Browse Source
This commit is contained in:
Chris Church
2015-06-02 20:23:12 -04:00
parent c24e51f515
commit 7770b813ea
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
awx/main/tasks.py
View File

@@ -14,6 +14,7 @@ import re
import shutil import shutil
import stat import stat
import tempfile import tempfile
import thread
import time import time
import traceback import traceback
import urlparse import urlparse
@@ -254,11 +255,18 @@ class BaseTask(Task):
private_data_files = {} private_data_files = {}
if private_data is not None: if private_data is not None:
for name, data in private_data.iteritems(): for name, data in private_data.iteritems():
handle, path = tempfile.mkstemp(dir=kwargs.get('private_data_dir', None)) # For credentials used with ssh-add, write to a named pipe which
f = os.fdopen(handle, 'w') # will be read then closed, instead of leaving the SSH key on disk.
f.write(data) if name in ('credential', 'scm_credential', 'ad_hoc_credential'):
f.close() path = os.path.join(kwargs.get('private_data_dir', tempfile.gettempdir()), name)
os.chmod(path, stat.S_IRUSR | stat.S_IWUSR) os.mkfifo(path, 0600)
thread.start_new_thread(lambda p, d: open(p, 'w').write(d), (path, data))
else:
handle, path = tempfile.mkstemp(dir=kwargs.get('private_data_dir', None))
f = os.fdopen(handle, 'w')
f.write(data)
f.close()
os.chmod(path, stat.S_IRUSR | stat.S_IWUSR)
private_data_files[name] = path private_data_files[name] = path
return private_data_files return private_data_files
@@ -325,6 +333,7 @@ class BaseTask(Task):
def wrap_args_with_ssh_agent(self, args, ssh_key_path, ssh_auth_sock=None): def wrap_args_with_ssh_agent(self, args, ssh_key_path, ssh_auth_sock=None):
if ssh_key_path: if ssh_key_path:
cmd = ' && '.join([self.args2cmdline('ssh-add', ssh_key_path), cmd = ' && '.join([self.args2cmdline('ssh-add', ssh_key_path),
self.args2cmdline('rm', '-f', ssh_key_path),
self.args2cmdline(*args)]) self.args2cmdline(*args)])
args = ['ssh-agent'] args = ['ssh-agent']
if ssh_auth_sock: if ssh_auth_sock: