summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-01-30 15:57:53 +0000
committerErik Johnston <erik@matrix.org>2015-01-30 15:57:53 +0000
commitb724a809c46f782231e18b70a632ce1ea9c540da (patch)
treec0662f80ef0d2b96e03f55384d9a9a6000237ade /synapse/handlers
parentRemove debug logging (diff)
downloadsynapse-b724a809c46f782231e18b70a632ce1ea9c540da.tar.xz
Only auth_events with event if event in event.auth_events
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/federation.py4
1 files changed, 3 insertions, 1 deletions
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