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

Prevent rewriting the encrypted file if decryption fails

Browse source
This commit is contained in:
James Tanner 2014-03-19 16:31:03 -04:00
parent e71857fbdf
commit b8f627d1d5
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/utils/vault.py
View file

@ -113,7 +113,6 @@ class VaultLib(object):
# clean out header
data = self._split_header(data)
# create the cipher object
if 'Vault' + self.cipher_name in globals() and self.cipher_name in CIPHER_WHITELIST:
cipher = globals()['Vault' + self.cipher_name]
@ -123,6 +122,8 @@ class VaultLib(object):
# try to unencrypt data
data = this_cipher.decrypt(data, self.password)
if not data:
raise errors.AnsibleError("Decryption failed")
return data
@ -209,7 +210,10 @@ class VaultEditor(object):
this_vault = VaultLib(self.password)
if this_vault.is_encrypted(tmpdata):
dec_data = this_vault.decrypt(tmpdata)
self.write_data(dec_data, self.filename)
if not dec_data:
raise errors.AnsibleError("Decryption failed")
else:
self.write_data(dec_data, self.filename)
else:
raise errors.AnsibleError("%s is not encrypted" % self.filename)