summary refs log tree commit diff
path: root/synapse/federation/federation_server.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2021-10-04 14:17:05 +0100
committerBrendan Abolivier <babolivier@matrix.org>2021-10-04 14:17:05 +0100
commitebbd37b66db2c5ed700d50dd00e3e108d7f1268c (patch)
tree235bd75367c221a98d10c03eb86d63173e875bb2 /synapse/federation/federation_server.py
parentMerge branch 'release-v1.44' into matrix-org-hotfixes (diff)
parentFix error in `get_user_ip_and_agents` when fetching from the database (#10968) (diff)
downloadsynapse-ebbd37b66db2c5ed700d50dd00e3e108d7f1268c.tar.xz
Merge branch 'release-v1.44' into matrix-org-hotfixes
Diffstat (limited to 'synapse/federation/federation_server.py')
-rw-r--r--synapse/federation/federation_server.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py

index 638959cbec..5f4383eebc 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py
@@ -34,7 +34,7 @@ from twisted.internet import defer from twisted.internet.abstract import isIPAddress from twisted.python import failure -from synapse.api.constants import EduTypes, EventTypes, Membership +from synapse.api.constants import EduTypes, EventContentFields, EventTypes, Membership from synapse.api.errors import ( AuthError, Codes, @@ -765,11 +765,11 @@ class FederationServer(FederationBase): if ( room_version.msc3083_join_rules and event.membership == Membership.JOIN - and "join_authorised_via_users_server" in event.content + and EventContentFields.AUTHORISING_USER in event.content ): # We can only authorise our own users. authorising_server = get_domain_from_id( - event.content["join_authorised_via_users_server"] + event.content[EventContentFields.AUTHORISING_USER] ) if authorising_server != self.server_name: raise SynapseError(