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

Don't filter out dummy events when we're checking the visibility of state

pull/7066/head
Brendan Abolivier 2020-03-11 15:21:25 +00:00
parent 54dd28621b
commit 69ce55c510
No known key found for this signature in database
GPG Key ID: 1E015C145F1916CD
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
synapse/handlers/message.py
View File

@ -160,7 +160,7 @@ class MessageHandler(object):
raise NotFoundError("Can't find event for token %s" % (at_token,)) raise NotFoundError("Can't find event for token %s" % (at_token,))
visible_events = yield filter_events_for_client( visible_events = yield filter_events_for_client(
self.storage, user_id, last_events, apply_retention_policies=False self.storage, user_id, last_events, filter_send_to_client=False
) )
event = last_events[0] event = last_events[0]

15
synapse/visibility.py
View File

@ -49,7 +49,7 @@ def filter_events_for_client(
events, events,
is_peeking=False, is_peeking=False,
always_include_ids=frozenset(), always_include_ids=frozenset(),
apply_retention_policies=True, filter_send_to_client=True,
): ):
""" """
Check which events a user is allowed to see. If the user can see the event but its Check which events a user is allowed to see. If the user can see the event but its
@ -65,10 +65,9 @@ def filter_events_for_client(
events events
always_include_ids (set(event_id)): set of event ids to specifically always_include_ids (set(event_id)): set of event ids to specifically
include (unless sender is ignored) include (unless sender is ignored)
apply_retention_policies (bool): Whether to filter out events that's older than filter_send_to_client (bool): Whether we're checking an event that's going to be
allowed by the room's retention policy. Useful when this function is called sent to a client. This might not always be the case since this function can
to e.g. check whether a user should be allowed to see the state at a given also be called to check whether a user can see the state at a given point.
event rather than to know if it should send an event to a user's client(s).
Returns: Returns:
Deferred[list[synapse.events.EventBase]] Deferred[list[synapse.events.EventBase]]
@ -96,7 +95,7 @@ def filter_events_for_client(
erased_senders = yield storage.main.are_users_erased((e.sender for e in events)) erased_senders = yield storage.main.are_users_erased((e.sender for e in events))
if apply_retention_policies: if not filter_send_to_client:
room_ids = {e.room_id for e in events} room_ids = {e.room_id for e in events}
retention_policies = {} retention_policies = {}
@ -119,7 +118,7 @@ def filter_events_for_client(
the original event if they can see it as normal. the original event if they can see it as normal.
""" """
if event.type == "org.matrix.dummy_event": if event.type == "org.matrix.dummy_event" and filter_send_to_client:
return None return None
if not event.is_state() and event.sender in ignore_list: if not event.is_state() and event.sender in ignore_list:
@ -134,7 +133,7 @@ def filter_events_for_client(
# Don't try to apply the room's retention policy if the event is a state event, as # Don't try to apply the room's retention policy if the event is a state event, as
# MSC1763 states that retention is only considered for non-state events. # MSC1763 states that retention is only considered for non-state events.
if apply_retention_policies and not event.is_state(): if filter_send_to_client and not event.is_state():
retention_policy = retention_policies[event.room_id] retention_policy = retention_policies[event.room_id]
max_lifetime = retention_policy.get("max_lifetime") max_lifetime = retention_policy.get("max_lifetime")