Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Return a 404 from /state for an outlier #12087

Merged
merged 8 commits into from
Mar 21, 2022
Merged

Return a 404 from /state for an outlier #12087

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e4138c1
Replace `get_state_for_pdu`
richvdh Feb 25, 2022
662c6da
Return a 404 from `/state` and `/state_ids` for an outlier
richvdh Feb 25, 2022
c09f032
Remove redundant condition
richvdh Feb 25, 2022
962da90
Rename variable
richvdh Feb 25, 2022
ba17bae
Skip conversion to list
richvdh Feb 25, 2022
2daf131
Only remove `event` if it was in the result in the first place.
richvdh Feb 25, 2022
961dfc7
newsfile
richvdh Mar 3, 2022
59273a7
Assume that the state at an event includes that event
richvdh Mar 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions synapse/handlers/federation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -963,14 +963,17 @@ async def get_state_ids_for_pdu(self, room_id: str, event_id: str) -> List[str]:

state_map = next(iter(state_groups.values()))

if event.is_state():
# Get previous state
# we need the state *before* event.
state_key = event.get_state_key()
if (
state_key is not None
and state_map.get((event.type, state_key)) == event.event_id
richvdh marked this conversation as resolved.
Show resolved Hide resolved
):
if "replaces_state" in event.unsigned:
prev_id = event.unsigned["replaces_state"]
if prev_id != event.event_id:
state_map[(event.type, event.state_key)] = prev_id
state_map[(event.type, state_key)] = prev_id
else:
state_map.pop((event.type, event.state_key), None)
del state_map[(event.type, state_key)]

return list(state_map.values())

Expand Down