diff options
| author | David Robertson <davidr@element.io> | 2022-12-05 11:30:41 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-05 11:30:41 +0000 |
| commit | 93ac3c197ebcb56f4e68a93da5bd63b4a96b18f1 (patch) | |
| tree | a1083113cfb949e5973ef9f9da5a1ee9d18a7a26 | |
| parent | Handle 'go get' deprecation (#14611) (diff) | |
| download | synapse-93ac3c197ebcb56f4e68a93da5bd63b4a96b18f1.tar.xz | |
Suppress empty body warnings in room servelets (#14600)
* Suppress empty body warnings in room servelets We've already decided to allow empty bodies for backwards compat. The change here stops us from emitting a misleading warning; see also https://github.com/matrix-org/synapse/issues/14478#issuecomment-1319157105 * Changelog
| -rw-r--r-- | changelog.d/14600.bugfix | 1 | ||||
| -rw-r--r-- | synapse/rest/client/room.py | 14 |
2 files changed, 3 insertions, 12 deletions
diff --git a/changelog.d/14600.bugfix b/changelog.d/14600.bugfix new file mode 100644 index 0000000000..c4bf405684 --- /dev/null +++ b/changelog.d/14600.bugfix @@ -0,0 +1 @@ +Suppress a spurious warning when `POST /rooms/<room_id>/<membership>/`, `POST /join/<room_id_or_alias`, or the unspecced `PUT /join/<room_id_or_alias>/<txn_id>` receive an empty HTTP request body. diff --git a/synapse/rest/client/room.py b/synapse/rest/client/room.py index e70aa381f3..514eb6afc8 100644 --- a/synapse/rest/client/room.py +++ b/synapse/rest/client/room.py @@ -396,12 +396,7 @@ class JoinRoomAliasServlet(ResolveRoomIdMixin, TransactionRestServlet): ) -> Tuple[int, JsonDict]: requester = await self.auth.get_user_by_req(request, allow_guest=True) - try: - content = parse_json_object_from_request(request) - except Exception: - # Turns out we used to ignore the body entirely, and some clients - # cheekily send invalid bodies. - content = {} + content = parse_json_object_from_request(request, allow_empty_body=True) # twisted.web.server.Request.args is incorrectly defined as Optional[Any] args: Dict[bytes, List[bytes]] = request.args # type: ignore @@ -952,12 +947,7 @@ class RoomMembershipRestServlet(TransactionRestServlet): }: raise AuthError(403, "Guest access not allowed") - try: - content = parse_json_object_from_request(request) - except Exception: - # Turns out we used to ignore the body entirely, and some clients - # cheekily send invalid bodies. - content = {} + content = parse_json_object_from_request(request, allow_empty_body=True) if membership_action == "invite" and all( key in content for key in ("medium", "address") |