summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2018-04-13 15:46:37 +0100
committerMatthew Hodgson <matthew@matrix.org>2018-04-13 15:46:37 +0100
commit25b0ba30b1ffab9cb799bd8fc331581b7ff6f7aa (patch)
treec6416fa7fe93047c003eddb721da81071d363aaa
parentcorrectly auth inbound federation_domain_whitelist reqs (diff)
downloadsynapse-25b0ba30b1ffab9cb799bd8fc331581b7ff6f7aa.tar.xz
revert last to PR properly
-rw-r--r--synapse/federation/transport/server.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py
index d2a57d08d7..4c94d5a36c 100644
--- a/synapse/federation/transport/server.py
+++ b/synapse/federation/transport/server.py
@@ -94,6 +94,12 @@ class Authenticator(object):
             "signatures": {},
         }
 
+        if (
+            self.federation_domain_whitelist is not None and
+            self.server_name not in self.federation_domain_whitelist
+        ):
+            raise FederationDeniedError(self.server_name)
+
         if content is not None:
             json_request["content"] = content
 
@@ -132,12 +138,6 @@ 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
-        ):
-            raise FederationDeniedError(self.server_name)
-
         if not json_request["signatures"]:
             raise NoAuthenticationError(
                 401, "Missing Authorization headers", Codes.UNAUTHORIZED,