Merge pull request #3754 from matrix-org/erikj/fix_whitelist

Allow federation_domain_whitelist to be emtpy list
This commit is contained in:
Erik Johnston authored and GitHub committed 2018-08-24 12:23:39 +01:00
commit 84b4e76fed
2 files changed
+2 -1

No files matched your search

+1
View File
@@ -0,0 +1 @@
Fix 'federation_domain_whitelist' such that an empty list correctly blocks all outbound federation traffic
+1 -1
View File
@@ -133,7 +133,7 @@ class MatrixFederationHttpClient(object):
failures, connection failures, SSL failures.)
"""
if (
self.hs.config.federation_domain_whitelist and
self.hs.config.federation_domain_whitelist is not None and
destination not in self.hs.config.federation_domain_whitelist
):
raise FederationDeniedError(destination)