providers/saml: cleanup encoding

This commit is contained in:
Jens Langhammer 2020-02-20 21:33:10 +01:00
parent d06f1abb89
commit 38a22ddf13
2 changed files with 8 additions and 8 deletions

View File

@ -144,7 +144,7 @@ class Processor:
def _decode_and_parse_request(self):
"""Parses various parameters from _request_xml into _request_params."""
decoded_xml = decode_base64_and_inflate(self._saml_request).decode("utf-8")
decoded_xml = decode_base64_and_inflate(self._saml_request)
root = ElementTree.fromstring(decoded_xml)

View File

@ -3,20 +3,20 @@ import base64
import zlib
def decode_base64_and_inflate(b64string):
def decode_base64_and_inflate(encoded: str, encoding="utf-8") -> str:
"""Base64 decode and ZLib decompress b64string"""
decoded_data = base64.b64decode(b64string)
decoded_data = base64.b64decode(encoded)
try:
return zlib.decompress(decoded_data, -15)
return zlib.decompress(decoded_data, -15).decode(encoding)
except zlib.error:
return decoded_data
return decoded_data.decode(encoding)
def deflate_and_base64_encode(string_val):
def deflate_and_base64_encode(inflated: bytes, encoding="utf-8"):
"""Base64 and ZLib Compress b64string"""
zlibbed_str = zlib.compress(string_val)
zlibbed_str = zlib.compress(inflated)
compressed_string = zlibbed_str[2:-4]
return base64.b64encode(compressed_string)
return base64.b64encode(compressed_string).decode(encoding)
def nice64(src):