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

Allow federation_domain_whitelist to be emtpy list
matrix-org · Aug 24, 2018 · 84b4e76 · 84b4e76
2 parents 92d50e3 + c780d84
commit 84b4e76
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/changelog.d/3754.bugfix b/changelog.d/3754.bugfix
@@ -0,0 +1 @@
+Fix 'federation_domain_whitelist' such that an empty list correctly blocks all outbound federation traffic
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py
@@ -133,7 +133,7 @@ def _request(self, destination, method, path,
                 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)