diff --git a/synapse/config/server.py b/synapse/config/server.py
index f55a71d508..13627fc8bf 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -112,7 +112,7 @@ class ServerConfig(Config):
# FIXME: federation_domain_whitelist needs sytests
federation_domain_whitelist = config.get(
- "federation_domain_whitelist", [],
+ "federation_domain_whitelist", None,
)
self.federation_domain_whitelist = None
diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py
index 1ddfbbd7f4..452599e1a1 100644
--- a/synapse/federation/transport/server.py
+++ b/synapse/federation/transport/server.py
@@ -127,8 +127,10 @@ class Authenticator(object):
json_request["origin"] = origin
json_request["signatures"].setdefault(origin, {})[key] = sig
- if (self.federation_domain_whitelist is not None and
- origin not in self.federation_domain_whitelist):
+ if (
+ self.federation_domain_whitelist is not None and
+ origin not in self.federation_domain_whitelist
+ ):
raise FederationDeniedError(origin)
if not json_request["signatures"]:
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py
index b834d06219..ff63d0b2a8 100644
--- a/synapse/http/matrixfederationclient.py
+++ b/synapse/http/matrixfederationclient.py
@@ -283,8 +283,10 @@ class MatrixFederationHttpClient(object):
else:
_sec_timeout = self.default_timeout
- if (self.hs.config.federation_domain_whitelist is not None and
- request.destination not in self.hs.config.federation_domain_whitelist):
+ if (
+ self.hs.config.federation_domain_whitelist is not None and
+ request.destination not in self.hs.config.federation_domain_whitelist
+ ):
raise FederationDeniedError(request.destination)
limiter = yield synapse.util.retryutils.get_retry_limiter(
diff --git a/synapse/rest/key/v2/remote_key_resource.py b/synapse/rest/key/v2/remote_key_resource.py
index 5a14cfd426..eb8782aa6e 100644
--- a/synapse/rest/key/v2/remote_key_resource.py
+++ b/synapse/rest/key/v2/remote_key_resource.py
@@ -139,8 +139,10 @@ class RemoteKey(Resource):
store_queries = []
for server_name, key_ids in query.items():
- if (self.federation_domain_whitelist is not None and
- server_name not in self.federation_domain_whitelist):
+ if (
+ self.federation_domain_whitelist is not None and
+ server_name not in self.federation_domain_whitelist
+ ):
logger.debug("Federation denied with %s", server_name)
continue
diff --git a/synapse/rest/media/v1/media_repository.py b/synapse/rest/media/v1/media_repository.py
index 40b10e68c0..bdffa97805 100644
--- a/synapse/rest/media/v1/media_repository.py
+++ b/synapse/rest/media/v1/media_repository.py
@@ -231,8 +231,10 @@ class MediaRepository(object):
Deferred: Resolves once a response has successfully been written
to request
"""
- if (self.federation_domain_whitelist is not None and
- server_name not in self.federation_domain_whitelist):
+ if (
+ self.federation_domain_whitelist is not None and
+ server_name not in self.federation_domain_whitelist
+ ):
raise FederationDeniedError(server_name)
self.mark_recently_accessed(server_name, media_id)
@@ -269,8 +271,10 @@ class MediaRepository(object):
Returns:
Deferred[dict]: The media_info of the file
"""
- if (self.federation_domain_whitelist is not None and
- server_name not in self.federation_domain_whitelist):
+ if (
+ self.federation_domain_whitelist is not None and
+ server_name not in self.federation_domain_whitelist
+ ):
raise FederationDeniedError(server_name)
# We linearize here to ensure that we don't try and download remote
|
