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

Merge pull request #259 from cchurch/ssh_key_data_fifo

Browse Source 
Write SSH key data to named pipe
This commit is contained in:
Chris Church
2015-06-03 23:33:16 -04:00
parent 716255af6a 7770b813ea
commit 6679afe190
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

@@ -15,6 +15,7 @@ import shutil
import stat import stat
import subprocess import subprocess
import tempfile import tempfile
import thread
import time import time
import traceback import traceback
import urlparse import urlparse
@@ -272,11 +273,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
@@ -343,6 +351,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: