Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 11:26:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix application of ACLs

Browse source
This commit is contained in:
Erik Johnston 2015-08-11 10:41:40 +01:00
parent 10b874067b
commit 1b994a97dd
4 changed files with 33 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

16
synapse/handlers/message.py
View file

@ -137,7 +137,7 @@ class MessageHandler(BaseHandler):
@defer.inlineCallbacks
def _filter_events_for_client(self, user_id, room_id, events):
states = yield self.store.get_state_for_events(
event_id_to_state = yield self.store.get_state_for_events(
room_id, frozenset(e.event_id for e in events),
types=(
(EventTypes.RoomHistoryVisibility, ""),
@ -145,7 +145,8 @@ class MessageHandler(BaseHandler):
)
)
events_and_states = zip(events, states)
for ev, state in event_id_to_state.items():
logger.info("event_id: %r, state: %r", ev, state)
def allowed(event_and_state):
event, state = event_and_state
@ -179,10 +180,17 @@ class MessageHandler(BaseHandler):
return True
events_and_states = filter(allowed, events_and_states)
event_and_state = filter(
allowed,
[
(e, event_id_to_state[e.event_id])
for e in events
]
)
defer.returnValue([
ev
for ev, _ in events_and_states
for ev, _ in event_and_state
])
@defer.inlineCallbacks