wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Now that we convert salt inside of do_encryptas needed, keep salt as text type until then.

Browse source
This commit is contained in:
Toshio Kuratomi 2016-10-20 13:48:20 -07:00
parent cf0da0948d
commit 6d9f780937
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/ansible/plugins/lookup/password.py
View file

@ -248,8 +248,7 @@ class LookupModule(LookupBase):
_write_password_file(b_path, content)
if params['encrypt']:
password = do_encrypt(plaintext_password, params['encrypt'],
salt=to_bytes(salt, encoding='ascii', errors='strict'))
password = do_encrypt(plaintext_password, params['encrypt'], salt=salt)
ret.append(password)
else:
ret.append(plaintext_password)

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

@ -67,7 +67,7 @@ except ImportError:
from ansible import constants as C
from ansible.errors import AnsibleError
from ansible.module_utils._text import to_text, to_native
from ansible.module_utils._text import to_text, to_bytes
__all__ = ['do_encrypt']
@ -84,8 +84,10 @@ def do_encrypt(result, encrypt, salt_size=None, salt=None):
if salt_size:
result = crypt.encrypt(result, salt_size=salt_size)
elif salt:
if not crypt._salt_is_bytes:
salt = to_native(salt)
if crypt._salt_is_bytes:
salt = to_bytes(salt, encoding='ascii', errors='strict')
else:
salt = to_text(salt, encoding='ascii', errors='strict')
result = crypt.encrypt(result, salt=salt)
else:
result = crypt.encrypt(result)