valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ensure object is type basestring and not only string

Browse Source
This commit is contained in:
nfraison 2015-06-30 22:14:37 +02:00
parent 639ca1b5b7
commit 7c3f6cf2a7
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/renderers/gpg.py
View File

@ -98,6 +98,7 @@ import salt.ext.six as six
# pylint: disable=import-error
try:
import gnupg
HAS_GPG = True
if salt.utils.which('gpg') is None:
HAS_GPG = False
@ -122,7 +123,7 @@ def decrypt_ciphertext(cypher, gpg, safe=False):
decrypted_data = gpg.decrypt(cypher)
if not decrypted_data.ok:
decrypt_err = "Could not decrypt cipher {0}, received {1}".format(
cypher, decrypted_data.stderr)
cypher, decrypted_data.stderr)
log.error(decrypt_err)
if safe:
raise SaltRenderError(decrypt_err)
@ -134,11 +135,11 @@ def decrypt_ciphertext(cypher, gpg, safe=False):
def decrypt_object(obj, gpg):
'''
Recursively try to decrypt any object. If the object is a string, and
Recursively try to decrypt any object. If the object is a basestring (string or unicode), and
it contains a valid GPG header, decrypt it, otherwise keep going until
a string is found.
'''
if isinstance(obj, str):
if isinstance(obj, basestring):
if GPG_HEADER.search(obj):
return decrypt_ciphertext(obj, gpg)
else: