Be tolerant of blank TLS fingerprints config (#4589)

matrix-org · Feb 11, 2019 · 4ffd10f · 4ffd10f
1 parent b201149
commit 4ffd10f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/changelog.d/4589.bugfix b/changelog.d/4589.bugfix
@@ -0,0 +1 @@
+Synapse is now tolerant of the tls_fingerprints option being None or not specified.
diff --git a/synapse/config/tls.py b/synapse/config/tls.py
@@ -45,7 +45,11 @@ def read_config(self, 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)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Synapse is now tolerant of the tls_fingerprints option being None or not specified.