From 1b60a1181ea8e2c072a47d77ad4db40a9ad01dd6 Mon Sep 17 00:00:00 2001
From: Sean Quah <seanq@matrix.org>
Date: Mon, 5 Sep 2022 23:06:16 +0100
Subject: [PATCH] Don't add previously rejected events to state during state
 res

Signed-off-by: Sean Quah <seanq@matrix.org>
---
 synapse/state/v2.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/synapse/state/v2.py b/synapse/state/v2.py
index af03851c7142..0cda9ee120ea 100644
--- a/synapse/state/v2.py
+++ b/synapse/state/v2.py
@@ -577,15 +577,16 @@ async def _iterative_auth_checks(
                 if ev.rejected_reason is None:
                     auth_events[key] = event_map[ev_id]
 
-        try:
-            event_auth.check_state_dependent_auth_rules(
-                event,
-                auth_events.values(),
-            )
+        if event.rejected_reason is None:
+            try:
+                event_auth.check_state_dependent_auth_rules(
+                    event,
+                    auth_events.values(),
+                )
 
-            resolved_state[(event.type, event.state_key)] = event_id
-        except AuthError:
-            pass
+                resolved_state[(event.type, event.state_key)] = event_id
+            except AuthError:
+                pass
 
         # We await occasionally when we're working with large data sets to
         # ensure that we don't block the reactor loop for too long.