summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-12-10 15:09:45 +0000
committerGitHub <noreply@github.com>2019-12-10 15:09:45 +0000
commit424fd58237d4a40c6f94772be136298d326fcd69 (patch)
tree5a1711444c847358df7f4ac4fa50a8558b284f34 /synapse
parentMerge pull request #6505 from matrix-org/erikj/make_deferred_yiedable (diff)
downloadsynapse-424fd58237d4a40c6f94772be136298d326fcd69.tar.xz
Remove redundant code from event authorisation implementation. (#6502)
Diffstat (limited to 'synapse')
-rw-r--r--synapse/event_auth.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/synapse/event_auth.py b/synapse/event_auth.py
index ec3243b27b..c940b84470 100644
--- a/synapse/event_auth.py
+++ b/synapse/event_auth.py
@@ -42,6 +42,8 @@ def check(room_version, event, auth_events, do_sig_check=True, do_size_check=Tru
     Returns:
          if the auth checks pass.
     """
+    assert isinstance(auth_events, dict)
+
     if do_size_check:
         _check_size_limits(event)
 
@@ -74,12 +76,6 @@ def check(room_version, event, auth_events, do_sig_check=True, do_size_check=Tru
             if not event.signatures.get(event_id_domain):
                 raise AuthError(403, "Event not signed by sending server")
 
-    if auth_events is None:
-        # Oh, we don't know what the state of the room was, so we
-        # are trusting that this is allowed (at least for now)
-        logger.warning("Trusting event: %s", event.event_id)
-        return
-
     if event.type == EventTypes.Create:
         sender_domain = get_domain_from_id(event.sender)
         room_id_domain = get_domain_from_id(event.room_id)