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

Fix 'ansible-vault edit' crash on changed nonascii

Browse source 
ansible-vault edit was attempting to decode the file contents
and failing.

Fixes #18428

(cherry picked from commit c09060e8ff)
This commit is contained in:
Adrian Likins 2016-11-04 13:28:44 -04:00
parent bc539adddc
commit 47d5f0f0a8
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -398,18 +398,18 @@ class VaultEditor:
self._shred_file(tmp_path) self._shred_file(tmp_path)
raise raise
tmpdata = self.read_data(tmp_path) b_tmpdata = self.read_data(tmp_path)
# Do nothing if the content has not changed # Do nothing if the content has not changed
if existing_data == tmpdata and not force_save: if existing_data == b_tmpdata and not force_save:
self._shred_file(tmp_path) self._shred_file(tmp_path)
return return
# encrypt new data and write out to tmp # encrypt new data and write out to tmp
# An existing vaultfile will always be UTF-8, # An existing vaultfile will always be UTF-8,
# so decode to unicode here # so decode to unicode here
enc_data = self.vault.encrypt(tmpdata.decode()) b_ciphertext = self.vault.encrypt(b_tmpdata)
self.write_data(enc_data, tmp_path) self.write_data(b_ciphertext, tmp_path)
# shuffle tmp file into place # shuffle tmp file into place
self.shuffle_files(tmp_path, filename) self.shuffle_files(tmp_path, filename)
@ -420,9 +420,9 @@ class VaultEditor:
# A file to be encrypted into a vaultfile could be any encoding # A file to be encrypted into a vaultfile could be any encoding
# so treat the contents as a byte string. # so treat the contents as a byte string.
plaintext = self.read_data(filename) b_plaintext = self.read_data(filename)
ciphertext = self.vault.encrypt(plaintext) b_ciphertext = self.vault.encrypt(b_plaintext)
self.write_data(ciphertext, output_file or filename) self.write_data(b_ciphertext, output_file or filename)
def decrypt_file(self, filename, output_file=None): def decrypt_file(self, filename, output_file=None):