diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2020-06-15 13:42:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-15 13:42:44 -0400 |
| commit | 2b2344652b215b8023fb37deeacbb395f3c68d7c (patch) | |
| tree | 1a854996e701b379fde25e23e8a07460fb1dcc6e | |
| parent | Update m.id.phone to use 'phone' instead of 'number' (#7687) (diff) | |
| download | synapse-2b2344652b215b8023fb37deeacbb395f3c68d7c.tar.xz | |
Ensure etag is a string for GET room_keys/version response (#7691)
| -rw-r--r-- | changelog.d/7691.bugfix | 1 | ||||
| -rw-r--r-- | synapse/handlers/e2e_room_keys.py | 1 | ||||
| -rw-r--r-- | tests/handlers/test_e2e_room_keys.py | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/changelog.d/7691.bugfix b/changelog.d/7691.bugfix new file mode 100644 index 0000000000..2a8a480c53 --- /dev/null +++ b/changelog.d/7691.bugfix @@ -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. diff --git a/synapse/handlers/e2e_room_keys.py b/synapse/handlers/e2e_room_keys.py index 2efea801bc..f55470a707 100644 --- a/synapse/handlers/e2e_room_keys.py +++ b/synapse/handlers/e2e_room_keys.py @@ -349,6 +349,7 @@ class E2eRoomKeysHandler(object): raise res["count"] = yield self.store.count_e2e_room_keys(user_id, res["version"]) + res["etag"] = str(res["etag"]) return res @trace diff --git a/tests/handlers/test_e2e_room_keys.py b/tests/handlers/test_e2e_room_keys.py index 70f172eb02..822ea42dde 100644 --- a/tests/handlers/test_e2e_room_keys.py +++ b/tests/handlers/test_e2e_room_keys.py @@ -96,6 +96,7 @@ class E2eRoomKeysHandlerTestCase(unittest.TestCase): # check we can retrieve it as the current version res = yield self.handler.get_version_info(self.local_user) version_etag = res["etag"] + self.assertIsInstance(version_etag, str) del res["etag"] self.assertDictEqual( res, |