Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-10-01 08:25:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allow empty federation_certificate_verification_whitelist (#6849)

Browse Source
This commit is contained in:
timfi 2020-02-06 15:45:01 +01:00 committed by GitHub
parent 99fcc96289
commit bce557175b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/6849.bugfix Normal file
View File

@ -0,0 +1 @@
Fix Synapse refusing to start if `federation_certificate_verification_whitelist` option is blank.

2
synapse/config/tls.py
View File

@ -109,6 +109,8 @@ class TlsConfig(Config):
fed_whitelist_entries = config.get( fed_whitelist_entries = config.get(
"federation_certificate_verification_whitelist", [] "federation_certificate_verification_whitelist", []
) )
if fed_whitelist_entries is None:
fed_whitelist_entries = []
# Support globs (*) in whitelist values # Support globs (*) in whitelist values
self.federation_certificate_verification_whitelist = [] # type: List[str] self.federation_certificate_verification_whitelist = [] # type: List[str]