external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2024-11-25 02:47:04 +00:00
Code Issues Releases Wiki Activity

better errors for ssl certificates

Browse Source
This commit is contained in:
Joshua Tauberer 2014-10-24 21:30:33 +00:00
parent 8b65c11cdf
commit f9acf0adec
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
management/status_checks.py
View File

@ -514,6 +514,9 @@ def check_certificate(domain, ssl_certificate, ssl_private_key):
# Certificate is self-signed. # Certificate is self-signed.
return ("SELF-SIGNED", None) return ("SELF-SIGNED", None)
elif retcode != 0: elif retcode != 0:
if "unable to get local issuer certificate" in verifyoutput:
return ("The certificate is missing an intermediate chain or the intermediate chain is incorrect or incomplete.", None)
# There is some unknown problem. Return the `openssl verify` raw output. # There is some unknown problem. Return the `openssl verify` raw output.
return ("There is a problem with the SSL certificate.", verifyoutput.strip()) return ("There is a problem with the SSL certificate.", verifyoutput.strip())
else: else:

2
management/web_update.py
View File

@ -229,6 +229,8 @@ def install_cert(domain, ssl_cert, ssl_chain, env):
if cert_status == "SELF-SIGNED": if cert_status == "SELF-SIGNED":
cert_status = "This is a self-signed certificate. I can't install that." cert_status = "This is a self-signed certificate. I can't install that."
os.unlink(fn) os.unlink(fn)
if cert_status_details is not None:
cert_status += " " + cert_status_details
return cert_status return cert_status
# Copy the certificate to its expected location. # Copy the certificate to its expected location.