summary refs log tree commit diff
path: root/synapse/handlers/room.py
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-17 13:58:40 +0100
committerNeil Johnson <neil@matrix.org>2018-08-17 13:58:40 +0100
commit9fd161c6fb93d2ab2d297e5190e1faaebbd7c892 (patch)
treef0439ed7a668a2b0d627b78aaab25b03a2fb6514 /synapse/handlers/room.py
parentserver limits config docs (diff)
parentMerge branch 'develop' into neilj/limit_exceeded_error (diff)
downloadsynapse-9fd161c6fb93d2ab2d297e5190e1faaebbd7c892.tar.xz
Merge branch 'neilj/limit_exceeded_error' of github.com:matrix-org/synapse into neilj/limit_exceeded_error
Diffstat (limited to 'synapse/handlers/room.py')
-rw-r--r--synapse/handlers/room.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 6a17c42238..c3f820b975 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -98,9 +98,13 @@ class RoomCreationHandler(BaseHandler):
         Raises:
             SynapseError if the room ID couldn't be stored, or something went
             horribly wrong.
+            ResourceLimitError if server is blocked to some resource being
+            exceeded
         """
         user_id = requester.user.to_string()
 
+        self.auth.check_auth_blocking(user_id)
+
         if not self.spam_checker.user_may_create_room(user_id):
             raise SynapseError(403, "You are not permitted to create rooms")