From 25b0ba30b1ffab9cb799bd8fc331581b7ff6f7aa Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Fri, 13 Apr 2018 15:46:37 +0100
Subject: [PATCH] revert last to PR properly
---
synapse/federation/transport/server.py | 12 ++++++------
1 file 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,
--
GitLab