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

Handle base64-encoded certificates better, import missing function

Browse Source
This commit is contained in:
Rob Crittenden 2009-12-17 11:30:14 -05:00 committed by Jason Gerard DeRose
parent 29f243bf4e
commit af20a1a2da
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ipalib/plugins/cert.py
View File

@ -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'))

1
ipalib/plugins/host.py
View File

@ -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

5
ipalib/plugins/service.py
View File

@ -37,6 +37,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: