mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-12-22 04:34:28 +03:00
Code Issues Projects Releases Packages Wiki Activity

Simplify with better exception handling

Browse source
This commit is contained in:
Andrew Morgan 2019-04-03 10:58:50 +01:00
parent 1fd5680496
commit 7c432de63e
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
synapse/config/tls.py
View file

@ -96,20 +96,15 @@ class TlsConfig(Config):
certs = [] certs = []
for ca_file in self.federation_custom_ca_list: for ca_file in self.federation_custom_ca_list:
logger.debug("Reading custom CA certificate file: %s", ca_file) logger.debug("Reading custom CA certificate file: %s", ca_file)
try: content = self.read_file(ca_file)
with open(ca_file, 'rb') as f:
content = f.read()
except Exception:
logger.fatal("Failed to read custom CA certificate off disk")
raise
# Parse the CA certificates # Parse the CA certificates
try: try:
cert_base = Certificate.loadPEM(content) cert_base = Certificate.loadPEM(content)
certs.append(cert_base) certs.append(cert_base)
except Exception: except Exception as e:
logger.fatal("Failed to parse custom CA certificate off disk") raise ConfigError("Error parsing custom CA certificate file %s: %s"
raise % (ca_file, e))
self.federation_custom_ca_list = trustRootFromCertificates(certs) self.federation_custom_ca_list = trustRootFromCertificates(certs)