diff options
| author | Neil Johnson <neil@matrix.org> | 2018-08-17 13:58:40 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@matrix.org> | 2018-08-17 13:58:40 +0100 |
| commit | 9fd161c6fb93d2ab2d297e5190e1faaebbd7c892 (patch) | |
| tree | f0439ed7a668a2b0d627b78aaab25b03a2fb6514 /synapse/handlers | |
| parent | server limits config docs (diff) | |
| parent | Merge branch 'develop' into neilj/limit_exceeded_error (diff) | |
| download | synapse-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')
| -rw-r--r-- | synapse/handlers/message.py | 6 | ||||
| -rw-r--r-- | synapse/handlers/room.py | 4 |
2 files changed, 9 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) 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") |