diff --git a/lemur/certificates/schemas.py b/lemur/certificates/schemas.py index 78217de0..64cc487f 100644 --- a/lemur/certificates/schemas.py +++ b/lemur/certificates/schemas.py @@ -255,6 +255,7 @@ class CertificateUploadInputSchema(CertificateCreationSchema): private_key = fields.String() body = fields.String(required=True) chain = fields.String(missing=None, allow_none=True) + csr = fields.String(required=False, allow_none=True, validate=validators.csr) destinations = fields.Nested(AssociatedDestinationSchema, missing=[], many=True) notifications = fields.Nested(AssociatedNotificationSchema, missing=[], many=True) diff --git a/lemur/certificates/views.py b/lemur/certificates/views.py index e77160b2..fe1a1f9c 100644 --- a/lemur/certificates/views.py +++ b/lemur/certificates/views.py @@ -306,6 +306,7 @@ class CertificatesUpload(AuthenticatedResource): "body": "-----BEGIN CERTIFICATE-----...", "chain": "-----BEGIN CERTIFICATE-----...", "privateKey": "-----BEGIN RSA PRIVATE KEY-----..." + "csr": "-----BEGIN CERTIFICATE REQUEST-----..." "destinations": [], "notifications": [], "replacements": [], diff --git a/lemur/static/app/angular/certificates/certificate/upload.tpl.html b/lemur/static/app/angular/certificates/certificate/upload.tpl.html index c3339051..bf897a60 100644 --- a/lemur/static/app/angular/certificates/certificate/upload.tpl.html +++ b/lemur/static/app/angular/certificates/certificate/upload.tpl.html @@ -62,6 +62,19 @@ a valid certificate.

+
+ +
+ +

Enter a valid certificate signing request.

+
+