summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2019-02-11 21:04:27 +1100
committerRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-02-11 10:04:27 +0000
commit4ffd10f46d62f7bc5430d148260e3240b7a0598b (patch)
tree141d399796f09e148d6d96a66a57ce9348c6c3c5 /synapse
parentMerge pull request #4420 from matrix-org/jaywink/openid-listener (diff)
downloadsynapse-4ffd10f46d62f7bc5430d148260e3240b7a0598b.tar.xz
Be tolerant of blank TLS fingerprints config (#4589)
Diffstat (limited to 'synapse')
-rw-r--r--synapse/config/tls.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/synapse/config/tls.py b/synapse/config/tls.py
index b5f2cfd9b7..81b3a659fe 100644
--- a/synapse/config/tls.py
+++ b/synapse/config/tls.py
@@ -45,7 +45,11 @@ class TlsConfig(Config):
 
         self.tls_certificate_file = self.abspath(config.get("tls_certificate_path"))
         self.tls_private_key_file = self.abspath(config.get("tls_private_key_path"))
-        self._original_tls_fingerprints = config["tls_fingerprints"]
+        self._original_tls_fingerprints = config.get("tls_fingerprints", [])
+
+        if self._original_tls_fingerprints is None:
+            self._original_tls_fingerprints = []
+
         self.tls_fingerprints = list(self._original_tls_fingerprints)
         self.no_tls = config.get("no_tls", False)