OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

make FederationHandler.on_query_auth async

pull/6837/head
Richard van der Hoff 2020-02-03 15:30:23 +00:00
parent 370080531e
commit b3e44f0bdf
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
synapse/handlers/federation.py
View File

@ -2120,15 +2120,14 @@ class FederationHandler(BaseHandler):
logger.warning("Soft-failing %r because %s", event, e) logger.warning("Soft-failing %r because %s", event, e)
event.internal_metadata.soft_failed = True event.internal_metadata.soft_failed = True
@defer.inlineCallbacks async def on_query_auth(
def on_query_auth(
self, origin, event_id, room_id, remote_auth_chain, rejects, missing self, origin, event_id, room_id, remote_auth_chain, rejects, missing
): ):
in_room = yield self.auth.check_host_in_room(room_id, origin) in_room = await self.auth.check_host_in_room(room_id, origin)
if not in_room: if not in_room:
raise AuthError(403, "Host not in room.") raise AuthError(403, "Host not in room.")
event = yield self.store.get_event( event = await self.store.get_event(
event_id, allow_none=False, check_room_id=room_id event_id, allow_none=False, check_room_id=room_id
) )
@ -2136,19 +2135,19 @@ class FederationHandler(BaseHandler):
# don't want to fall into the trap of `missing` being wrong. # don't want to fall into the trap of `missing` being wrong.
for e in remote_auth_chain: for e in remote_auth_chain:
try: try:
yield self._handle_new_event(origin, e) await self._handle_new_event(origin, e)
except AuthError: except AuthError:
pass pass
# Now get the current auth_chain for the event. # Now get the current auth_chain for the event.
local_auth_chain = yield self.store.get_auth_chain( local_auth_chain = await self.store.get_auth_chain(
[auth_id for auth_id in event.auth_event_ids()], include_given=True [auth_id for auth_id in event.auth_event_ids()], include_given=True
) )
# TODO: Check if we would now reject event_id. If so we need to tell # TODO: Check if we would now reject event_id. If so we need to tell
# everyone. # everyone.
ret = yield self.construct_auth_difference(local_auth_chain, remote_auth_chain) ret = await self.construct_auth_difference(local_auth_chain, remote_auth_chain)
logger.debug("on_query_auth returning: %s", ret) logger.debug("on_query_auth returning: %s", ret)