diff options
author | Patrick Cloke <clokep@users.noreply.github.com> | 2023-09-18 09:02:12 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-18 13:02:12 +0000 |
commit | 63d28a88c1d18c64ea7e23b6dd7483e6d5dcf881 (patch) | |
tree | 525cf0979721716353d01b1329b9d6bbe55a7437 /synapse/rest | |
parent | Mandate Pillow>=10.0.1 because of libwebp CVE (#16347) (diff) | |
download | synapse-63d28a88c1d18c64ea7e23b6dd7483e6d5dcf881.tar.xz |
Additional validation of receipts (#16327)
Reject invalid receipts with a reasonable error message & expands tests for receipts.
Diffstat (limited to 'synapse/rest')
-rw-r--r-- | synapse/rest/client/read_marker.py | 2 | ||||
-rw-r--r-- | synapse/rest/client/receipts.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/client/read_marker.py b/synapse/rest/client/read_marker.py index 1707e51972..15e4d56cdb 100644 --- a/synapse/rest/client/read_marker.py +++ b/synapse/rest/client/read_marker.py @@ -84,7 +84,7 @@ class ReadMarkerRestServlet(RestServlet): await self.receipts_handler.received_client_receipt( room_id, receipt_type, - user_id=requester.user.to_string(), + user_id=requester.user, event_id=event_id, # Setting the thread ID is not possible with the /read_markers endpoint. thread_id=None, diff --git a/synapse/rest/client/receipts.py b/synapse/rest/client/receipts.py index 869a374459..814d075faf 100644 --- a/synapse/rest/client/receipts.py +++ b/synapse/rest/client/receipts.py @@ -108,7 +108,7 @@ class ReceiptRestServlet(RestServlet): await self.receipts_handler.received_client_receipt( room_id, receipt_type, - user_id=requester.user.to_string(), + user_id=requester.user, event_id=event_id, thread_id=thread_id, ) |