saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

salt.utils.hashutils: Only decode to utf-8 on Windows

Browse source 
We only decode to unicode so that we can use some of these functions in
Jinja filters. Since CP1252 will incorrectly decode certain bytestrings,
force utf8 decoding on Windows.
This commit is contained in:
Erik Johnson 2018-06-08 16:46:05 -05:00
parent ea85f882bc
commit 58c7cd33d7
No known key found for this signature in database
GPG key ID: 5E5583C437808F3F
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
salt/utils/hashutils.py
View file

@ -13,6 +13,7 @@ import random
# Import Salt libs
from salt.ext import six
import salt.utils.files
import salt.utils.platform
import salt.utils.stringutils
from salt.utils.decorators.jinja import jinja_filter
@ -27,7 +28,8 @@ def base64_b64encode(instr):
newline ('\\n') characters in the encoded output.
'''
return salt.utils.stringutils.to_unicode(
base64.b64encode(salt.utils.stringutils.to_bytes(instr))
base64.b64encode(salt.utils.stringutils.to_bytes(instr)),
encoding='utf8' if salt.utils.platform.is_windows() else None
)
@ -38,7 +40,10 @@ def base64_b64decode(instr):
'''
decoded = base64.b64decode(salt.utils.stringutils.to_bytes(instr))
try:
return salt.utils.stringutils.to_unicode(decoded)
return salt.utils.stringutils.to_unicode(
decoded,
encoding='utf8' if salt.utils.platform.is_windows() else None
)
except UnicodeDecodeError:
return decoded
@ -52,7 +57,8 @@ def base64_encodestring(instr):
at the end of the encoded string.
'''
return salt.utils.stringutils.to_unicode(
base64.encodestring(salt.utils.stringutils.to_bytes(instr))
base64.encodestring(salt.utils.stringutils.to_bytes(instr)),
encoding='utf8' if salt.utils.platform.is_windows() else None
)
@ -68,7 +74,10 @@ def base64_decodestring(instr):
# PY2
decoded = base64.decodestring(b)
try:
return salt.utils.stringutils.to_unicode(decoded)
return salt.utils.stringutils.to_unicode(
decoded,
encoding='utf8' if salt.utils.platform.is_windows() else None
)
except UnicodeDecodeError:
return decoded