Matrix/synapse
Matrix/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse synced 2024-06-28 11:33:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ACL filtering

Browse source
This commit is contained in:
Erik Johnston 2015-08-11 17:19:21 +01:00
parent 8a345190cc
commit 40affadaaa
4 changed files with 29 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
synapse/handlers/federation.py
View file

@ -229,7 +229,7 @@ class FederationHandler(BaseHandler):
@defer.inlineCallbacks
def _filter_events_for_server(self, server_name, room_id, events):
states = yield self.store.get_state_for_events(
events_to_state = yield self.store.get_state_for_events(
room_id, frozenset(e.event_id for e in events),
types=(
(EventTypes.RoomHistoryVisibility, ""),
@ -237,8 +237,6 @@ class FederationHandler(BaseHandler):
)
)
events_and_states = zip(events, states)
def redact_disallowed(event_and_state):
event, state = event_and_state
@ -275,9 +273,10 @@ class FederationHandler(BaseHandler):
return event
res = map(redact_disallowed, events_and_states)
logger.info("_filter_events_for_server %r", res)
res = map(redact_disallowed, [
(e, events_to_state[e.event_id])
for e in events
])
defer.returnValue(res)

15
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,8 +145,6 @@ class MessageHandler(BaseHandler):
)
)
events_and_states = zip(events, states)
def allowed(event_and_state):
event, state = event_and_state
@ -179,10 +177,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

16
synapse/handlers/sync.py
View file

@ -294,7 +294,7 @@ class SyncHandler(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, ""),
@ -302,8 +302,6 @@ class SyncHandler(BaseHandler):
)
)
events_and_states = zip(events, states)
def allowed(event_and_state):
event, state = event_and_state
@ -335,10 +333,18 @@ class SyncHandler(BaseHandler):
return membership == Membership.INVITE
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

6
synapse/storage/state.py
View file

@ -316,10 +316,10 @@ class StateStore(SQLBaseStore):
for event_id, state_ids in event_to_state_ids.items()
}
defer.returnValue([
event_to_state[event]
defer.returnValue({
event: event_to_state[event]
for event in event_ids
])
})
def _make_group_id(clock):