diff options
| author | timfi <timfierens@fastmail.com> | 2020-02-06 15:45:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-06 14:45:01 +0000 |
| commit | bce557175bad82889d303b349e6575636c41b702 (patch) | |
| tree | edfd9fad05eb2a06baa2a10097d3284fe8108e4c | |
| parent | Third party event rules Update (#6781) (diff) | |
| download | synapse-bce557175bad82889d303b349e6575636c41b702.tar.xz | |
Allow empty federation_certificate_verification_whitelist (#6849)
Diffstat (limited to '')
| -rw-r--r-- | changelog.d/6849.bugfix | 1 | ||||
| -rw-r--r-- | synapse/config/tls.py | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/changelog.d/6849.bugfix b/changelog.d/6849.bugfix new file mode 100644 index 0000000000..d928a26ec6 --- /dev/null +++ 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 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] |