Exclude rejected state events when calculating state at backwards ext…

…rems (#6527) This fixes a weird bug where, if you were determined enough, you could end up with a rejected event forming part of the state at a backwards-extremity. Authing that backwards extrem would then lead to us trying to pull the rejected event from the db (with allow_rejected=False), which would fail with a 404.
matrix-org · Dec 16, 2019 · bbb75ff · bbb75ff
1 parent ff773ff
commit bbb75ff
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/changelog.d/6527.bugfix b/changelog.d/6527.bugfix
@@ -0,0 +1 @@
+Fix a bug which could cause the federation server to incorrectly return errors when handling certain obscure event graphs.
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
@@ -606,7 +606,7 @@ 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]
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.