Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add `include_event_in_state` to _get_state_for_room (#6521) 

Make it return the state *after* the requested event, rather than the one
before it. This is a bit easier and requires fewer calls to
get_events_from_store_or_dest.
This commit is contained in:
Richard van der Hoff 2019-12-11 16:37:51 +00:00 committed by Richard van der Hoff
parent be294d6fde
commit 20d5ba16e6
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1 @@
Refactor some code in the event authentication path for clarity.

39
synapse/handlers/federation.py
View File

@ -379,22 +379,10 @@ class FederationHandler(BaseHandler):
( (
remote_state, remote_state,
got_auth_chain, got_auth_chain,
) = yield self._get_state_for_room(origin, room_id, p) ) = yield self._get_state_for_room(
origin, room_id, p, include_event_in_state=True
# we want the state *after* p; _get_state_for_room returns the
# state *before* p.
remote_event = yield self.federation_client.get_pdu(
[origin], p, room_version, outlier=True
) )
if remote_event is None:
raise Exception(
"Unable to get missing prev_event %s" % (p,)
)
if remote_event.is_state():
remote_state.append(remote_event)
# XXX hrm I'm not convinced that duplicate events will compare # XXX hrm I'm not convinced that duplicate events will compare
# for equality, so I'm not sure this does what the author # for equality, so I'm not sure this does what the author
# hoped. # hoped.
@ -583,13 +571,15 @@ class FederationHandler(BaseHandler):
@defer.inlineCallbacks @defer.inlineCallbacks
@log_function @log_function
def _get_state_for_room(self, destination, room_id, event_id): def _get_state_for_room(self, destination, room_id, event_id, include_event_in_state):
"""Requests all of the room state at a given event from a remote homeserver. """Requests all of the room state at a given event from a remote homeserver.
Args: Args:
destination (str): The remote homeserver to query for the state. destination (str): The remote homeserver to query for the state.
room_id (str): The id of the room we're interested in. room_id (str): The id of the room we're interested in.
event_id (str): The id of the event we want the state at. event_id (str): The id of the event we want the state at.
include_event_in_state: if true, the event itself will be included in the
returned state event list.
Returns: Returns:
Deferred[Tuple[List[EventBase], List[EventBase]]]: Deferred[Tuple[List[EventBase], List[EventBase]]]:
@ -604,6 +594,10 @@ class FederationHandler(BaseHandler):
) )
desired_events = set(state_event_ids + auth_event_ids) desired_events = set(state_event_ids + auth_event_ids)
if include_event_in_state:
desired_events.add(event_id)
event_map = yield self._get_events_from_store_or_dest( event_map = yield self._get_events_from_store_or_dest(
destination, room_id, desired_events destination, room_id, desired_events
) )
@ -616,12 +610,21 @@ class FederationHandler(BaseHandler):
failed_to_fetch, failed_to_fetch,
) )
pdus = [event_map[e_id] for e_id in state_event_ids if e_id in event_map] remote_state = [
auth_chain = [event_map[e_id] for e_id in auth_event_ids if e_id in event_map] event_map[e_id] for e_id in state_event_ids if e_id in event_map
]
if include_event_in_state:
remote_event = event_map.get(event_id)
if not remote_event:
raise Exception("Unable to get missing prev_event %s" % (event_id,))
if remote_event.is_state():
remote_state.append(remote_event)
auth_chain = [event_map[e_id] for e_id in auth_event_ids if e_id in event_map]
auth_chain.sort(key=lambda e: e.depth) auth_chain.sort(key=lambda e: e.depth)
return pdus, auth_chain return remote_state, auth_chain
@defer.inlineCallbacks @defer.inlineCallbacks
def _get_events_from_store_or_dest(self, destination, room_id, event_ids): def _get_events_from_store_or_dest(self, destination, room_id, event_ids):