summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-08-24 12:10:01 +0100
committerErik Johnston <erik@matrix.org>2018-08-24 12:13:12 +0100
commit1d67b13674c681b0e228049e34fa2fbd43703bb9 (patch)
treea339700427f24e7c2c503a44eda203c383f2c6e8
parentMerge pull request #3749 from matrix-org/erikj/add_trial_users (diff)
downloadsynapse-1d67b13674c681b0e228049e34fa2fbd43703bb9.tar.xz
Fix bug when federation_domain_whitelist is an emtpy list
Outbound federation were incorrectly allowed when the config option was
set to an empty list
-rw-r--r--synapse/http/matrixfederationclient.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py
index 44b61e70a4..b34bb8e31a 100644
--- a/synapse/http/matrixfederationclient.py
+++ b/synapse/http/matrixfederationclient.py
@@ -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)