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

Merge branch 'master' into pmelse-workaround-#2857

This commit is contained in:
Hossein Shafagh 2020-01-20 15:14:03 -08:00 committed by GitHub
parent 58d8a145c3 9b1317f4a4
commit 6d06f3ca6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lemur/plugins/lemur_aws/plugin.py
View File

@ -212,7 +212,7 @@ class AWSSourcePlugin(SourcePlugin):
if not regions: if not regions:
regions = ec2.get_regions(account_number=account_number) regions = ec2.get_regions(account_number=account_number)
else: else:
regions = regions.split(",") regions = "".join(regions.split()).split(",")
for region in regions: for region in regions:
elbs = elb.get_all_elbs(account_number=account_number, region=region) elbs = elb.get_all_elbs(account_number=account_number, region=region)

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

@ -171,6 +171,9 @@ def map_cis_fields(options, csr):
"units": [options["organizational_unit"]], "units": [options["organizational_unit"]],
}, },
} }
# possibility to default to a SIGNING_ALGORITHM for a given profile
if current_app.config.get("DIGICERT_CIS_SIGNING_ALGORITHMS", {}).get(options['authority'].name):
data["signature_hash"] = current_app.config.get("DIGICERT_CIS_SIGNING_ALGORITHMS", {}).get(options['authority'].name)
return data return data