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

Allow proper detection of zones, fix certificate detection

Browse Source
This commit is contained in:
Curtis Castrapel
2018-08-14 14:37:45 -07:00
parent e050177c08
commit 2c22c9c2f1
8 changed files with 54 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lemur/sources/service.py
View File

@ -115,13 +115,16 @@ def sync_certificates(source, user):
certificates = s.get_certificates(source.options)
for certificate in certificates:
exists = False
if certificate.get('name'):
exists = [certificate_service.get_by_name(certificate['name'])]
result = certificate_service.get_by_name(certificate['name'])
if result:
exists = [result]
elif certificate.get('serial'):
if not exists and certificate.get('serial'):
exists = certificate_service.get_by_serial(certificate['serial'])
else:
if not exists:
cert = parse_certificate(certificate['body'])
exists = certificate_service.get_by_serial(serial(cert))
@ -129,7 +132,6 @@ def sync_certificates(source, user):
certificate['owner'] = user.email
certificate['creator'] = user
exists = [x for x in exists if x]
if not exists: