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

Exclude rejected state events when calculating state at backwards extrems #6527

Merged
merged 2 commits into from
Dec 16, 2019
Merged

Exclude rejected state events when calculating state at backwards extrems #6527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba179a8
Exclude rejected state events when calculating state at backwards ext…
richvdh Dec 10, 2019
8db289f
newsfile
richvdh Dec 16, 2019
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
1 change: 1 addition & 0 deletions changelog.d/6527.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix a bug which could cause the federation server to incorrectly return errors when handling certain obscure event graphs.
2 changes: 1 addition & 1 deletion synapse/handlers/federation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,7 @@ async def _get_state_for_room(
remote_event = event_map.get(event_id)
if not remote_event:
raise Exception("Unable to get missing prev_event %s" % (event_id,))
if remote_event.is_state():
if remote_event.is_state() and remote_event.rejected_reason is None:
remote_state.append(remote_event)

auth_chain = [event_map[e_id] for e_id in auth_event_ids if e_id in event_map]
Expand Down