diff options
author | Neil Johnson <neil@matrix.org> | 2018-08-17 12:44:26 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-17 12:44:26 +0000 |
commit | 69c49d3fa3dc91ff6cbbadb52dc14e60cb063ecc (patch) | |
tree | a2a6e5b2b873ffb119d6124e4b9feae56bc22bbd /synapse/handlers/room.py | |
parent | add new error type ResourceLimit (diff) | |
parent | Merge pull request #3708 from matrix-org/neilj/resource_Limit_block_event_cre... (diff) | |
download | synapse-69c49d3fa3dc91ff6cbbadb52dc14e60cb063ecc.tar.xz |
Merge branch 'develop' into neilj/limit_exceeded_error
Diffstat (limited to 'synapse/handlers/room.py')
-rw-r--r-- | synapse/handlers/room.py | 4 |
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") |