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

* commit '6920d8889':
  Exclude rejected state events when calculating state at backwards extrems (#6527)

2 files changed, 2 insertions, 1 deletions

diff --git a/changelog.d/6527.bugfix b/changelog.d/6527.bugfix
new file mode 100644

index 0000000000..53214b0748
--- /dev/null
+++ 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.
\ No newline at end of file
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py

index 6e3144e47f..4d152d5985 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -605,7 +605,7 @@ class FederationHandler(BaseHandler):
             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]