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

Prevent message search in upgraded rooms we're not in (#6385)

Browse source
This commit is contained in:
Andrew Morgan 2019-12-11 13:07:25 +00:00 • committed by GitHub
parent 54ae52ba96
commit ea0f0ad414
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 41 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

18
synapse/storage/data_stores/main/state.py
View file

@ -278,7 +278,7 @@ class StateGroupWorkerStore(
@defer.inlineCallbacks
def get_room_predecessor(self, room_id):
"""Get the predecessor room of an upgraded room if one exists.
"""Get the predecessor of an upgraded room if it exists.
Otherwise return None.
Args:
@ -291,14 +291,22 @@ class StateGroupWorkerStore(
* room_id (str): The room ID of the predecessor room
* event_id (str): The ID of the tombstone event in the predecessor room
None if a predecessor key is not found, or is not a dictionary.
Raises:
NotFoundError if the room is unknown
NotFoundError if the given room is unknown
"""
# Retrieve the room's create event
create_event = yield self.get_create_event_for_room(room_id)
# Return predecessor if present
return create_event.content.get("predecessor", None)
# Retrieve the predecessor key of the create event
predecessor = create_event.content.get("predecessor", None)
# Ensure the key is a dictionary
if not isinstance(predecessor, dict):
return None
return predecessor
@defer.inlineCallbacks
def get_create_event_for_room(self, room_id):
@ -318,7 +326,7 @@ class StateGroupWorkerStore(
# If we can't find the create event, assume we've hit a dead end
if not create_id:
raise NotFoundError("Unknown room %s" % (room_id))
raise NotFoundError("Unknown room %s" % (room_id,))
# Retrieve the room's create event and return
create_event = yield self.get_event(create_id)