Allow empty federation_certificate_verification_whitelist (#6849)

* commit 'bce557175': Allow empty federation_certificate_verification_whitelist (#6849)
matrix-org · Mar 23, 2020 · 29102e0 · 29102e0
2 parents 693425b + bce5571
commit 29102e0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/changelog.d/6849.bugfix b/changelog.d/6849.bugfix
@@ -0,0 +1 @@
+Fix Synapse refusing to start if `federation_certificate_verification_whitelist` option is blank.
diff --git a/synapse/config/tls.py b/synapse/config/tls.py
@@ -109,6 +109,8 @@ def read_config(self, config: dict, config_dir_path: str, **kwargs):
         fed_whitelist_entries = config.get(
             "federation_certificate_verification_whitelist", []
         )
+        if fed_whitelist_entries is None:
+            fed_whitelist_entries = []
 
         # Support globs (*) in whitelist values
         self.federation_certificate_verification_whitelist = []  # type: List[str]