summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authortimfi <timfierens@fastmail.com>2020-02-06 15:45:01 +0100
committerGitHub <noreply@github.com>2020-02-06 14:45:01 +0000
commitbce557175bad82889d303b349e6575636c41b702 (patch)
treeedfd9fad05eb2a06baa2a10097d3284fe8108e4c /synapse/config
parentThird party event rules Update (#6781) (diff)
downloadsynapse-bce557175bad82889d303b349e6575636c41b702.tar.xz
Allow empty federation_certificate_verification_whitelist (#6849)
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/tls.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/config/tls.py b/synapse/config/tls.py
index 2e9e478a2a..2514b0713d 100644
--- a/synapse/config/tls.py
+++ b/synapse/config/tls.py
@@ -109,6 +109,8 @@ class TlsConfig(Config):
         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]