Matrix-Mirrors/forked-synapse
1
0
Fork 0
mirror of https://mau.dev/maunium/synapse.git synced 2024-10-01 01:36:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Ensure etag is a string for GET room_keys/version response (#7691)

Browse Source
This commit is contained in:
Hubert Chathi 2020-06-15 13:42:44 -04:00 committed by GitHub
parent b8ee03caff
commit 2b2344652b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/7691.bugfix Normal file
View File

@ -0,0 +1 @@
Fix a long standing bug where the response to the `GET room_keys/version` endpoint had the incorrect type for the `etag` field.

1
synapse/handlers/e2e_room_keys.py
View File

@ -349,6 +349,7 @@ class E2eRoomKeysHandler(object):
raise raise
res["count"] = yield self.store.count_e2e_room_keys(user_id, res["version"]) res["count"] = yield self.store.count_e2e_room_keys(user_id, res["version"])
res["etag"] = str(res["etag"])
return res return res
@trace @trace

1
tests/handlers/test_e2e_room_keys.py
View File

@ -96,6 +96,7 @@ class E2eRoomKeysHandlerTestCase(unittest.TestCase):
# check we can retrieve it as the current version # check we can retrieve it as the current version
res = yield self.handler.get_version_info(self.local_user) res = yield self.handler.get_version_info(self.local_user)
version_etag = res["etag"] version_etag = res["etag"]
self.assertIsInstance(version_etag, str)
del res["etag"] del res["etag"]
self.assertDictEqual( self.assertDictEqual(
res, res,