summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-04-03 11:11:13 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2019-04-03 11:11:13 +0100
commit4f03528d345e95ec5ed63615c37df55a6e7ca93d (patch)
tree6bccc7ec35bd9e06460fe26de147a26afc4cac82
parentSimplify with better exception handling (diff)
downloadsynapse-4f03528d345e95ec5ed63615c37df55a6e7ca93d.tar.xz
Raise config error if empty ca list
-rw-r--r--synapse/config/tls.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/config/tls.py b/synapse/config/tls.py
index 2022da5147..e8d417d024 100644
--- a/synapse/config/tls.py
+++ b/synapse/config/tls.py
@@ -93,6 +93,10 @@ class TlsConfig(Config):
 
         # Read in and parse custom CA certificates
         if self.federation_custom_ca_list is not None:
+            if self.federation_custom_ca_list:
+                raise ConfigError("federation_custom_ca_list specified without "
+                                  "any certificate files")
+
             certs = []
             for ca_file in self.federation_custom_ca_list:
                 logger.debug("Reading custom CA certificate file: %s", ca_file)