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

Don’t set ‘custom_expiration_date’ if validity years is set in the UI. (#742)

Browse Source 
* Don’t set ‘custom_expiration_date’ if validity years is set in the UI.

* Use single quotes instead of double quotes.
This commit is contained in:
Michael Treacher 2017-04-05 10:11:17 +10:00 committed by kevgliss
parent e18a188723
commit 7f019583f2
2 changed files with 53 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lemur/plugins/lemur_digicert/plugin.py
View File

@ -89,11 +89,18 @@ def get_issuance(options):
:param options:
:return:
"""
if not options.get('validity_end'):
options['validity_end'] = arrow.utcnow().replace(years=current_app.config.get('DIGICERT_DEFAULT_VALIDITY', 1))
options['validity_years'] = determine_validity_years(options['validity_end'])
return options
validity_years = options.get('validity_years')
if validity_years:
options['validity_end'] = None
return options
else:
if not options.get('validity_end'):
options['validity_end'] = arrow.utcnow().replace(years=current_app.config.get('DIGICERT_DEFAULT_VALIDITY', 1))
options['validity_years'] = determine_validity_years(options['validity_end'])
return options
def get_additional_names(options):
@ -131,7 +138,11 @@ def map_fields(options, csr):
})
data['certificate']['dns_names'] = get_additional_names(options)
data['custom_expiration_date'] = options['validity_end'].format('YYYY-MM-DD')
if options.get('validity_end'):
data['custom_expiration_date'] = options['validity_end'].format('YYYY-MM-DD')
data['validity_years'] = options.get('validity_years')
return data

41
lemur/plugins/lemur_digicert/tests/test_digicert.py
View File

@ -7,10 +7,10 @@ from lemur.tests.vectors import CSR_STR
from cryptography import x509
def test_map_fields(app):
def test_map_fields_with_validity_end_and_start(app):
from lemur.plugins.lemur_digicert.plugin import map_fields
names = ['one.example.com', 'two.example.com', 'three.example.com']
names = [u'one.example.com', u'two.example.com', u'three.example.com']
options = {
'common_name': 'example.com',
@ -35,14 +35,47 @@ def test_map_fields(app):
'signature_hash': 'sha256'
},
'organization': {'id': 111111},
'custom_expiration_date': arrow.get(2017, 5, 7).format('YYYY-MM-DD')
'custom_expiration_date': arrow.get(2017, 5, 7).format('YYYY-MM-DD'),
'validity_years': 1
}
def test_map_fields_with_validity_years(app):
from lemur.plugins.lemur_digicert.plugin import map_fields
names = [u'one.example.com', u'two.example.com', u'three.example.com']
options = {
'common_name': 'example.com',
'owner': 'bob@example.com',
'description': 'test certificate',
'extensions': {
'sub_alt_names': {
'names': [x509.DNSName(x) for x in names]
}
},
'validity_years': 2,
'validity_end': arrow.get(2017, 10, 30)
}
data = map_fields(options, CSR_STR)
assert data == {
'certificate': {
'csr': CSR_STR,
'common_name': 'example.com',
'dns_names': names,
'signature_hash': 'sha256'
},
'organization': {'id': 111111},
'validity_years': 2
}
def test_map_cis_fields(app):
from lemur.plugins.lemur_digicert.plugin import map_cis_fields
names = ['one.example.com', 'two.example.com', 'three.example.com']
names = [u'one.example.com', u'two.example.com', u'three.example.com']
options = {
'common_name': 'example.com',