Host cache_joined_hosts_for_event to caller (#10986)

`_check_event_auth` is only called in two places, and only one of those sets
`send_on_behalf_of`. Warming the cache isn't really part of auth anyway, so
moving it out makes a lot more sense.
This commit is contained in:
Richard van der Hoff 2021-10-05 13:01:41 +01:00 committed by GitHub
parent d099535deb
commit 787af4a106
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 10 deletions

1
changelog.d/10986.misc Normal file
View File

@ -0,0 +1 @@
Clean up some of the federation event authentication code for clarity.

View File

@ -356,6 +356,11 @@ class FederationEventHandler:
) )
# all looks good, we can persist the event. # all looks good, we can persist the event.
# First, precalculate the joined hosts so that the federation sender doesn't
# need to.
await self._event_creation_handler.cache_joined_hosts_for_event(event, context)
await self._run_push_actions_and_persist_event(event, context) await self._run_push_actions_and_persist_event(event, context)
return event, context return event, context
@ -1299,17 +1304,10 @@ class FederationEventHandler:
except AuthError as e: except AuthError as e:
logger.warning("Failed auth resolution for %r because %s", event, e) logger.warning("Failed auth resolution for %r because %s", event, e)
context.rejected = RejectedReason.AUTH_ERROR context.rejected = RejectedReason.AUTH_ERROR
return context
if not context.rejected: await self._check_for_soft_fail(event, state, backfilled, origin=origin)
await self._check_for_soft_fail(event, state, backfilled, origin=origin) await self._maybe_kick_guest_users(event)
await self._maybe_kick_guest_users(event)
# If we are going to send this event over federation we precaclculate
# the joined hosts.
if event.internal_metadata.get_send_on_behalf_of():
await self._event_creation_handler.cache_joined_hosts_for_event(
event, context
)
return context return context