Infra
/
lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed an issue were default notifications were added even when updati… (#395) 

* Fixed an issue were default notifications were added even when updating a certificate, resulting in duplicate notifications.

* Ensuring imported certificates get the same treatment.
This commit is contained in:
kevgliss 2016-07-07 11:44:11 -07:00 committed by GitHub
parent 74bf54cb8f
commit 1ba7181067
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lemur/certificates/schemas.py
View File

@ -28,8 +28,10 @@ class CertificateSchema(LemurInputSchema):
owner = fields.Email(required=True) owner = fields.Email(required=True)
description = fields.String() description = fields.String()
class CertificateCreationSchema(CertificateSchema):
@post_load @post_load
def default_notifications(self, data): def default_notification(self, data):
if not data['notifications']: if not data['notifications']:
notification_name = "DEFAULT_{0}".format(data['owner'].split('@')[0].upper()) notification_name = "DEFAULT_{0}".format(data['owner'].split('@')[0].upper())
data['notifications'] += notification_service.create_default_expiration_notifications(notification_name, [data['owner']]) data['notifications'] += notification_service.create_default_expiration_notifications(notification_name, [data['owner']])
@ -39,7 +41,7 @@ class CertificateSchema(LemurInputSchema):
return data return data
class CertificateInputSchema(CertificateSchema): class CertificateInputSchema(CertificateCreationSchema):
name = fields.String() name = fields.String()
common_name = fields.String(required=True, validate=validators.sensitive_domain) common_name = fields.String(required=True, validate=validators.sensitive_domain)
authority = fields.Nested(AssociatedAuthoritySchema, required=True) authority = fields.Nested(AssociatedAuthoritySchema, required=True)
@ -127,7 +129,7 @@ class CertificateOutputSchema(LemurOutputSchema):
endpoints = fields.Nested(EndpointNestedOutputSchema, many=True, missing=[]) endpoints = fields.Nested(EndpointNestedOutputSchema, many=True, missing=[])
class CertificateUploadInputSchema(CertificateSchema): class CertificateUploadInputSchema(CertificateCreationSchema):
name = fields.String() name = fields.String()
active = fields.Boolean(missing=True) active = fields.Boolean(missing=True)