Matrix/synapse
Matrix/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse synced 2024-08-21 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

make FederationHandler.on_make_leave_request async

Browse source
This commit is contained in:
Richard van der Hoff 2020-02-03 15:40:41 +00:00
parent d184cbc031
commit 6e89ec5e32
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
synapse/handlers/federation.py
View file

@ -1581,20 +1581,17 @@ class FederationHandler(BaseHandler):
assert event.room_id == room_id assert event.room_id == room_id
return origin, event, room_version return origin, event, room_version
@defer.inlineCallbacks async def on_make_leave_request(
@log_function self, origin: str, room_id: str, user_id: str
def on_make_leave_request(self, origin, room_id, user_id): ) -> EventBase:
""" We've received a /make_leave/ request, so we create a partial """ We've received a /make_leave/ request, so we create a partial
leave event for the room and return that. We do *not* persist or leave event for the room and return that. We do *not* persist or
process it until the other server has signed it and sent it back. process it until the other server has signed it and sent it back.
Args: Args:
origin (str): The (verified) server name of the requesting server. origin: The (verified) server name of the requesting server.
room_id (str): Room to create leave event in room_id: Room to create leave event in
user_id (str): The user to create the leave for user_id: The user to create the leave for
Returns:
Deferred[FrozenEvent]
""" """
if get_domain_from_id(user_id) != origin: if get_domain_from_id(user_id) != origin:
logger.info( logger.info(
@ -1604,7 +1601,7 @@ class FederationHandler(BaseHandler):
) )
raise SynapseError(403, "User not from origin", Codes.FORBIDDEN) raise SynapseError(403, "User not from origin", Codes.FORBIDDEN)
room_version = yield self.store.get_room_version_id(room_id) room_version = await self.store.get_room_version_id(room_id)
builder = self.event_builder_factory.new( builder = self.event_builder_factory.new(
room_version, room_version,
{ {
@ -1616,11 +1613,11 @@ class FederationHandler(BaseHandler):
}, },
) )
event, context = yield self.event_creation_handler.create_new_client_event( event, context = await self.event_creation_handler.create_new_client_event(
builder=builder builder=builder
) )
event_allowed = yield self.third_party_event_rules.check_event_allowed( event_allowed = await self.third_party_event_rules.check_event_allowed(
event, context event, context
) )
if not event_allowed: if not event_allowed:
@ -1632,7 +1629,7 @@ class FederationHandler(BaseHandler):
try: try:
# The remote hasn't signed it yet, obviously. We'll do the full checks # The remote hasn't signed it yet, obviously. We'll do the full checks
# when we get the event back in `on_send_leave_request` # when we get the event back in `on_send_leave_request`
yield self.auth.check_from_context( await self.auth.check_from_context(
room_version, event, context, do_sig_check=False room_version, event, context, do_sig_check=False
) )
except AuthError as e: except AuthError as e: