Accept an incoming certificate as either DER or base64 in the service plugin.

The plugin required a base64-encoded certificate and always decoded it
before processing. This doesn't work with the UI because the json module
decodes binary values already.

Try to detect if the incoming value is base64-encoded and decode if
necessary. Finally, try to pull the cert apart to validate it. This will
tell us for sure that the data is a certificate, regardless of the format
it came in as.

ticket 348

1 files changed, 17 insertions, 1 deletions

diff --git a/ipalib/errors.py b/ipalib/errors.py
index 0d1304e0d..42d43ce64 100644
--- a/ipalib/errors.py
+++ b/ipalib/errors.py
@@ -1204,7 +1204,7 @@ class CertificateError(ExecutionError):
     errno = 4300
 
 
-class CertificateOperationError(ExecutionError):
+class CertificateOperationError(CertificateError):
     """
     **4301** Raised when a certificate operation cannot be completed
 
@@ -1220,6 +1220,22 @@ class CertificateOperationError(ExecutionError):
     errno = 4301
     format = _('Certificate operation cannot be completed: %(error)s')
 
+class CertificateFormatError(CertificateError):
+    """
+    **4302** Raised when a certificate is badly formatted
+
+    For example:
+
+    >>> raise CertificateFormatError(error=u'improperly formated DER-encoded certificate')
+    Traceback (most recent call last):
+      ...
+    CertificateFormatError: improperly formated DER-encoded certificate
+
+    """
+
+    errno = 4302
+    format = _('Certificate format error: %(error)s')
+
 
 class MutuallyExclusiveError(ExecutionError):
     """