maxmustermann/synapse
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

make FederationHandler.on_make_join_request async

Browse source
This commit is contained in:
Richard van der Hoff 2020-02-03 15:35:30 +00:00
parent af8ba6b525
commit 98681f90cb
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

@ -1348,20 +1348,17 @@ class FederationHandler(BaseHandler):
"Error handling queued PDU %s from %s: %s", p.event_id, origin, e "Error handling queued PDU %s from %s: %s", p.event_id, origin, e
) )
@defer.inlineCallbacks async def on_make_join_request(
@log_function self, origin: str, room_id: str, user_id: str
def on_make_join_request(self, origin, room_id, user_id): ) -> EventBase:
""" We've received a /make_join/ request, so we create a partial """ We've received a /make_join/ request, so we create a partial
join event for the room and return that. We do *not* persist or join 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 join event in room_id: Room to create join event in
user_id (str): The user to create the join for user_id: The user to create the join for
Returns:
Deferred[FrozenEvent]
""" """
if get_domain_from_id(user_id) != origin: if get_domain_from_id(user_id) != origin:
logger.info( logger.info(
@ -1373,7 +1370,7 @@ class FederationHandler(BaseHandler):
event_content = {"membership": Membership.JOIN} event_content = {"membership": Membership.JOIN}
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,
@ -1387,14 +1384,14 @@ class FederationHandler(BaseHandler):
) )
try: try:
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
) )
except AuthError as e: except AuthError as e:
logger.warning("Failed to create join to %s because %s", room_id, e) logger.warning("Failed to create join to %s because %s", room_id, e)
raise e raise e
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:
@ -1405,7 +1402,7 @@ class FederationHandler(BaseHandler):
# 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_join_request` # when we get the event back in `on_send_join_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
) )