diff options
author | Erik Johnston <erikj@jki.re> | 2016-09-02 14:43:35 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-02 14:43:35 +0100 |
commit | 273b6bcf22cddf75abd95e0a065a52cf6281cf98 (patch) | |
tree | 250665c2542210004b840a64648198aab9be57f3 /synapse | |
parent | Docstrings (diff) | |
parent | Comment on when auth chain and state are None (diff) | |
download | synapse-273b6bcf22cddf75abd95e0a065a52cf6281cf98.tar.xz |
Merge pull request #1064 from matrix-org/erikj/on_receive_check
Only check if host is in room if we have state and auth_chain
Diffstat (limited to '')
-rw-r--r-- | synapse/handlers/federation.py | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 6ca69e2fdf..dc90a5dde4 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -101,6 +101,9 @@ class FederationHandler(BaseHandler): def on_receive_pdu(self, origin, pdu, state=None, auth_chain=None): """ Called by the ReplicationLayer when we have a new pdu. We need to do auth checks and put it through the StateHandler. + + auth_chain and state are None if we already have the necessary state + and prev_events in the db """ event = pdu @@ -118,12 +121,21 @@ class FederationHandler(BaseHandler): # FIXME (erikj): Awful hack to make the case where we are not currently # in the room work - is_in_room = yield self.auth.check_host_in_room( - event.room_id, - self.server_name - ) - if not is_in_room and not event.internal_metadata.is_outlier(): - logger.debug("Got event for room we're not in.") + # If state and auth_chain are None, then we don't need to do this check + # as we already know we have enough state in the DB to handle this + # event. + if state and auth_chain and not event.internal_metadata.is_outlier(): + is_in_room = yield self.auth.check_host_in_room( + event.room_id, + self.server_name + ) + else: + is_in_room = True + if not is_in_room: + logger.info( + "Got event for room we're not in: %r %r", + event.room_id, event.event_id + ) try: event_stream_id, max_stream_id = yield self._persist_auth_tree( |