ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-05-02 15:21:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

fix decrypted vault utf8 values (#37539)

Browse source 
* Fix errors decrypted non-ascii vault vars

AnsibleVaultEncryptedUnicode was just using b"".decode()
instead of to_text() on the bytestrings returned from
vault.decrypt() and could cause errors on python2
if non-ascii since decode() defaults to ascii.
Use to_text() to default to decoding utf-8.

add intg and unit tests for value of vaulted vars
being non-ascii utf8

based on https://github.com/ansible/ansible/issues/37258

Fixes #37258

* yamllint fixups
This commit is contained in:
Adrian Likins 2018-05-24 23:22:46 -04:00 • committed by ansibot
parent bbe57cbf90
commit 1613a739ad
6 changed files with 40 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/parsing/yaml/objects.py
View file

@ -104,7 +104,7 @@ class AnsibleVaultEncryptedUnicode(yaml.YAMLObject, AnsibleBaseYAMLObject):
if not self.vault:
# FIXME: raise exception?
return self._ciphertext
return self.vault.decrypt(self._ciphertext).decode()
return to_text(self.vault.decrypt(self._ciphertext))
@data.setter
def data(self, value):