github-com-docker-mailserver/docker-mailserver
1
0
Fork 0
mirror of https://github.com/docker-mailserver/docker-mailserver.git synced 2024-01-19 02:48:50 +00:00
Code Issues Projects Releases Wiki Activity

Fix error in python script extracting certs from the acme.json file if there are sections with null values as certs

Browse source 
Signed-off-by: Brandon Schmitt <Brandon.Schmitt@live.de>
This commit is contained in:
Brandon Schmitt 2020-12-06 20:29:12 +01:00
parent ec290acd1f
commit 6251f898ea
No known key found for this signature in database
GPG key ID: F34558B1EBBD662B
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
target/helper-functions.sh
View file

@ -56,11 +56,12 @@ import sys,json
acme = json.load(sys.stdin) acme = json.load(sys.stdin)
for key, value in acme.items(): for key, value in acme.items():
certs = value['Certificates'] certs = value['Certificates']
for cert in certs: if certs is not None:
if 'domain' in cert and 'key' in cert: for cert in certs:
if 'main' in cert['domain'] and cert['domain']['main'] == '${1}' or 'sans' in cert['domain'] and '${1}' in cert['domain']['sans']: if 'domain' in cert and 'key' in cert:
print cert['key'] if 'main' in cert['domain'] and cert['domain']['main'] == '${1}' or 'sans' in cert['domain'] and '${1}' in cert['domain']['sans']:
break print cert['key']
break
") ")
local CERT local CERT
@ -70,11 +71,12 @@ import sys,json
acme = json.load(sys.stdin) acme = json.load(sys.stdin)
for key, value in acme.items(): for key, value in acme.items():
certs = value['Certificates'] certs = value['Certificates']
for cert in certs: if certs is not None:
if 'domain' in cert and 'certificate' in cert: for cert in certs:
if 'main' in cert['domain'] and cert['domain']['main'] == '${1}' or 'sans' in cert['domain'] and '${1}' in cert['domain']['sans']: if 'domain' in cert and 'certificate' in cert:
print cert['certificate'] if 'main' in cert['domain'] and cert['domain']['main'] == '${1}' or 'sans' in cert['domain'] and '${1}' in cert['domain']['sans']:
break print cert['certificate']
break
") ")
if [[ -n "${KEY}${CERT}" ]] if [[ -n "${KEY}${CERT}" ]]

4
test/config/letsencrypt/acme.json
View file

@ -1,4 +1,8 @@
{ {
"empty": {
"Account": null,
"Certificates": null
},
"le": { "le": {
"Account": { "Account": {
"Email": "acme@admin.com", "Email": "acme@admin.com",