summary refs log tree commit diff
path: root/synapse/handlers/message.py
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-17 12:42:59 +0000
committerGitHub <noreply@github.com>2018-08-17 12:42:59 +0000
commita2d872e7b3770c454569d838bf1bb92115d9f32a (patch)
tree34c1b42c256987be5e0b56139a3da75d1f69ae8c /synapse/handlers/message.py
parentMerge pull request #3712 from matrix-org/travis/register-admin-docs (diff)
parentremove errant yield (diff)
downloadsynapse-a2d872e7b3770c454569d838bf1bb92115d9f32a.tar.xz
Merge pull request #3708 from matrix-org/neilj/resource_Limit_block_event_creation
Neilj/resource limit block event creation
Diffstat (limited to 'synapse/handlers/message.py')
-rw-r--r--synapse/handlers/message.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
index 893c9bcdc4..4d006df63c 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -276,10 +276,14 @@ class EventCreationHandler(object):
                 where *hashes* is a map from algorithm to hash.
 
                 If None, they will be requested from the database.
-
+        Raises:
+            ResourceLimitError if server is blocked to some resource being
+            exceeded
         Returns:
             Tuple of created event (FrozenEvent), Context
         """
+        yield self.auth.check_auth_blocking(requester.user.to_string())
+
         builder = self.event_builder_factory.new(event_dict)
 
         self.validator.validate_new(builder)