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

Enabling hex serial numbers without breaking backward compatibility. (#779)

Browse Source 
* Enabling hex serial numbers without breaking backward compatibility.

* Fixing tests.
This commit is contained in:
kevgliss
2017-05-05 11:04:09 -07:00
committed by GitHub
parent 381cd2e1ff
commit 9c9ca37586
4 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lemur/certificates/schemas.py
View File

@ -6,7 +6,7 @@
.. moduleauthor:: Kevin Glisson <kglisson@netflix.com>
"""
from flask import current_app
from marshmallow import fields, validate, validates_schema, post_load, pre_load, post_dump
from marshmallow import fields, validate, validates_schema, post_load, pre_load
from marshmallow.exceptions import ValidationError
from lemur.schemas import AssociatedAuthoritySchema, AssociatedDestinationSchema, AssociatedCertificateSchema, \
@ -23,7 +23,7 @@ from lemur.common.schema import LemurInputSchema, LemurOutputSchema
from lemur.common import validators, missing
from lemur.notifications import service as notification_service
from lemur.common.fields import ArrowDateTime
from lemur.common.fields import ArrowDateTime, Hex
class CertificateSchema(LemurInputSchema):
@ -181,6 +181,7 @@ class CertificateOutputSchema(LemurOutputSchema):
owner = fields.Email()
san = fields.Boolean()
serial = fields.String()
serial_hex = Hex(attribute='serial')
signing_algorithm = fields.String()
status = fields.Boolean()
@ -198,12 +199,6 @@ class CertificateOutputSchema(LemurOutputSchema):
endpoints = fields.Nested(EndpointNestedOutputSchema, many=True, missing=[])
replaced_by = fields.Nested(CertificateNestedOutputSchema, many=True, attribute='replaced')
@post_dump
def convert_serial_to_hex(self, data):
if data:
data['serial'] = hex(int(data['serial']))[2:].upper()
return data
class CertificateUploadInputSchema(CertificateCreationSchema):
name = fields.String()