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

Merge pull request #12572 from amenonsen/vault-pager

Browse source 
Make ansible-vault view not write plaintext to a tempfile
This commit is contained in:
Brian Coca 2015-09-30 12:50:59 -04:00
commit 6d8abe84e4
2 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/cli/vault.py
View file

@ -138,7 +138,7 @@ class VaultCLI(CLI):
def execute_view(self): def execute_view(self):
for f in self.args: for f in self.args:
self.editor.view_file(f) self.pager(self.editor.plaintext(f))
def execute_rekey(self): def execute_rekey(self):
for f in self.args: for f in self.args:

17
lib/ansible/parsing/vault/__init__.py
View file

@ -300,20 +300,14 @@ class VaultEditor:
else: else:
self._edit_file_helper(filename, existing_data=plaintext, force_save=False) self._edit_file_helper(filename, existing_data=plaintext, force_save=False)
def view_file(self, filename): def plaintext(self, filename):
check_prereqs() check_prereqs()
# FIXME: Why write this to a temporary file at all? It would be safer
# to feed it to the PAGER on stdin.
_, tmp_path = tempfile.mkstemp()
ciphertext = self.read_data(filename) ciphertext = self.read_data(filename)
plaintext = self.vault.decrypt(ciphertext) plaintext = self.vault.decrypt(ciphertext)
self.write_data(plaintext, tmp_path)
# drop the user into pager on the tmp file return plaintext
call(self._pager_shell_command(tmp_path))
os.remove(tmp_path)
def rekey_file(self, filename, new_password): def rekey_file(self, filename, new_password):
@ -361,13 +355,6 @@ class VaultEditor:
return editor return editor
def _pager_shell_command(self, filename):
PAGER = os.environ.get('PAGER','less')
pager = shlex.split(PAGER)
pager.append(filename)
return pager
class VaultFile(object): class VaultFile(object):
def __init__(self, password, filename): def __init__(self, password, filename):