IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

py3: normalize_certificate: support both bytes and unicode

Browse Source 
https://fedorahosted.org/freeipa/ticket/4985

Reviewed-By: Christian Heimes <cheimes@redhat.com>
This commit is contained in:
Martin Basti
2017-01-19 16:11:08 +01:00
parent b8d6524d43
commit 980c8a5f9e
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ipalib/x509.py
View File

@@ -251,13 +251,22 @@ def normalize_certificate(rawcert):
rawcert = strip_header(rawcert) rawcert = strip_header(rawcert)
if util.isvalid_base64(rawcert): try:
try: if isinstance(rawcert, bytes):
dercert = base64.b64decode(rawcert) # base64 must work with utf-8, otherwise it is raw bin certificate
except Exception as e: decoded_cert = rawcert.decode('utf-8')
raise errors.Base64DecodeError(reason=str(e)) else:
else: decoded_cert = rawcert
except UnicodeDecodeError:
dercert = rawcert dercert = rawcert
else:
if util.isvalid_base64(decoded_cert):
try:
dercert = base64.b64decode(decoded_cert)
except Exception as e:
raise errors.Base64DecodeError(reason=str(e))
else:
dercert = rawcert
# At this point we should have a DER certificate. # At this point we should have a DER certificate.
# Attempt to decode it. # Attempt to decode it.