summary refs log tree commit diff
path: root/synapse/handlers/_base.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-04-13 14:07:23 +0100
committerErik Johnston <erik@matrix.org>2016-04-13 14:07:23 +0100
commitf613a3e332e9162edd7c3a4dbe3129821f6e523d (patch)
treebb51ada17f6e40571bd53ebc52170004548e1980 /synapse/handlers/_base.py
parentUnused member variable (diff)
parentMeasure Auth.check (diff)
downloadsynapse-f613a3e332e9162edd7c3a4dbe3129821f6e523d.tar.xz
Merge pull request #720 from matrix-org/erikj/auth_chec
Don't auto log failed auth checks
Diffstat (limited to 'synapse/handlers/_base.py')
-rw-r--r--synapse/handlers/_base.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/synapse/handlers/_base.py b/synapse/handlers/_base.py
index aaf6b1b837..13a675b208 100644
--- a/synapse/handlers/_base.py
+++ b/synapse/handlers/_base.py
@@ -316,7 +316,11 @@ class BaseHandler(object):
         if ratelimit:
             self.ratelimit(requester)
 
-        self.auth.check(event, auth_events=context.current_state)
+        try:
+            self.auth.check(event, auth_events=context.current_state)
+        except AuthError as err:
+            logger.warn("Denying new event %r because %s", event, err)
+            raise err
 
         yield self.maybe_kick_guest_users(event, context.current_state.values())