From b724a809c46f782231e18b70a632ce1ea9c540da Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 30 Jan 2015 15:57:53 +0000
Subject: [PATCH] Only auth_events with event if event in event.auth_events

---
 synapse/handlers/federation.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 35cad4182a..40836e0c51 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -805,7 +805,9 @@ class FederationHandler(BaseHandler):
                     yield self._handle_new_event(
                         origin, ev, auth_events=auth
                     )
-                    auth_events[(ev.type, ev.state_key)] = ev
+
+                    if ev.event_id in event_auth_events:
+                        auth_events[(ev.type, ev.state_key)] = ev
                 except AuthError:
                     pass
 
-- 
GitLab