diff options
| -rw-r--r-- | ipalib/plugins/cert.py | 5 | ||||
| -rw-r--r-- | ipalib/plugins/host.py | 1 | ||||
| -rw-r--r-- | ipalib/plugins/service.py | 5 |
3 files changed, 11 insertions, 0 deletions
diff --git a/ipalib/plugins/cert.py b/ipalib/plugins/cert.py index 21d0ebcdb..a7cd4155f 100644 --- a/ipalib/plugins/cert.py +++ b/ipalib/plugins/cert.py @@ -53,6 +53,11 @@ def get_serial(certificate): if type(certificate) in (list, tuple): certificate = certificate[0] try: + certificate = base64.b64decode(certificate) + except Exception, e: + pass + try: + serial = x509.get_serial_number(certificate) except PyAsn1Error: raise errors.CertificateOperationError(error=_('Unable to decode certificate in entry')) diff --git a/ipalib/plugins/host.py b/ipalib/plugins/host.py index 3d59be7cf..6c76f518e 100644 --- a/ipalib/plugins/host.py +++ b/ipalib/plugins/host.py @@ -30,6 +30,7 @@ from ipalib import Str, Flag, Bytes from ipalib.plugins.baseldap import * from ipalib.plugins.service import split_principal from ipalib.plugins.service import validate_certificate +from ipalib.plugins.service import get_serial from ipalib import _, ngettext import base64 diff --git a/ipalib/plugins/service.py b/ipalib/plugins/service.py index f65ab3ebd..8c962f091 100644 --- a/ipalib/plugins/service.py +++ b/ipalib/plugins/service.py @@ -38,6 +38,11 @@ def get_serial(certificate): if type(certificate) in (list, tuple): certificate = certificate[0] try: + certificate = base64.b64decode(certificate) + except Exception: + pass + + try: serial = x509.get_serial_number(certificate, type=x509.DER) except PyAsn1Error: raise errors.GenericError( |