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

Fixing several small issues. (#341)

Browse Source 
* Fixing several small issues.

* Fixing tests.
This commit is contained in:
kevgliss
2016-06-01 11:18:00 -07:00
parent b2539b843b
commit 72e3fb5bfe
6 changed files with 40 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lemur/common/defaults.py
View File

@ -1,4 +1,4 @@
import sys
from flask import current_app
from cryptography import x509
from cryptography.hazmat.backends import default_backend
@ -6,7 +6,10 @@ from lemur.constants import SAN_NAMING_TEMPLATE, DEFAULT_NAMING_TEMPLATE
def parse_certificate(body):
return x509.load_pem_x509_certificate(bytes(body), default_backend())
if sys.version_info >= (3, 0):
return x509.load_pem_x509_certificate(body, default_backend())
else:
return x509.load_pem_x509_certificate(bytes(body), default_backend())
def certificate_name(common_name, issuer, not_before, not_after, san):

4
lemur/common/validators.py
View File

@ -102,10 +102,10 @@ def dates(data):
raise ValidationError('Validity start must be before validity end.')
if data.get('authority'):
if data.get('validity_start').replace(tzinfo=None) < data['authority'].authority_certificate.not_before:
if data.get('validity_start').replace(hour=0, minute=0, second=0, tzinfo=None) < data['authority'].authority_certificate.not_before.replace(hour=0, minute=0, second=0):
raise ValidationError('Validity start must not be before {0}'.format(data['authority'].authority_certificate.not_before))
if data.get('validity_end').replace(tzinfo=None) > data['authority'].authority_certificate.not_after:
if data.get('validity_end').replace(hour=0, minute=0, second=0, tzinfo=None) > data['authority'].authority_certificate.not_after.replace(hour=0, minute=0, second=0):
raise ValidationError('Validity end must not be after {0}'.format(data['authority'].authority_certificate.not_after))
if data.get('validity_years'):