diff options
| author | Richard van der Hoff <richard@matrix.org> | 2020-04-22 13:09:23 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2020-04-22 13:09:23 +0100 |
| commit | 2aa5bf13c80726d7211cf251b837b10708ec456d (patch) | |
| tree | 0b1ef558d52b093b7306d8cb3eb2b05a043555c6 /synapse/rest | |
| parent | Add ability to run replication protocol over redis. (#7040) (diff) | |
| parent | Do not treat display names as globs for push rules. (#7271) (diff) | |
| download | synapse-2aa5bf13c80726d7211cf251b837b10708ec456d.tar.xz | |
Merge branch 'release-v1.12.4' into develop
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/client/v2_alpha/account_data.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/synapse/rest/client/v2_alpha/account_data.py b/synapse/rest/client/v2_alpha/account_data.py index 64eb7fec3b..c1d4cd0caf 100644 --- a/synapse/rest/client/v2_alpha/account_data.py +++ b/synapse/rest/client/v2_alpha/account_data.py @@ -38,8 +38,12 @@ class AccountDataServlet(RestServlet): self.auth = hs.get_auth() self.store = hs.get_datastore() self.notifier = hs.get_notifier() + self._is_worker = hs.config.worker_app is not None async def on_PUT(self, request, user_id, account_data_type): + if self._is_worker: + raise Exception("Cannot handle PUT /account_data on worker") + requester = await self.auth.get_user_by_req(request) if user_id != requester.user.to_string(): raise AuthError(403, "Cannot add account data for other users.") @@ -86,8 +90,12 @@ class RoomAccountDataServlet(RestServlet): self.auth = hs.get_auth() self.store = hs.get_datastore() self.notifier = hs.get_notifier() + self._is_worker = hs.config.worker_app is not None async def on_PUT(self, request, user_id, room_id, account_data_type): + if self._is_worker: + raise Exception("Cannot handle PUT /account_data on worker") + requester = await self.auth.get_user_by_req(request) if user_id != requester.user.to_string(): raise AuthError(403, "Cannot add account data for other users.") |