Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 19:54:53 -04:00
Code Issues Projects Releases Packages Wiki Activity

make sure version is in body and wrap in linearizer queue

Browse source 
also add tests
This commit is contained in:
Hubert Chathi 2019-02-08 01:32:45 -05:00
parent d9e424bf64
commit afae8442b5
3 changed files with 100 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

37
synapse/handlers/e2e_room_keys.py
View file

@ -327,20 +327,35 @@ class E2eRoomKeysHandler(object):
Returns:
A deferred of an empty dict.
"""
try:
old_info = yield self.store.get_e2e_room_keys_version_info(user_id, version)
except StoreError as e:
if e.code == 404:
raise NotFoundError("Unknown backup version")
else:
raise
if old_info["algorithm"] != version_info["algorithm"]:
if "version" not in version_info:
raise SynapseError(
400,
"Algorithm does not match",
"Missing version in body",
Codes.MISSING_PARAM
)
if version_info["version"] != version:
raise SynapseError(
400,
"Version in body does not match",
Codes.INVALID_PARAM
)
with (yield self._upload_linearizer.queue(user_id)):
try:
old_info = yield self.store.get_e2e_room_keys_version_info(
user_id, version
)
except StoreError as e:
if e.code == 404:
raise NotFoundError("Unknown backup version")
else:
raise
if old_info["algorithm"] != version_info["algorithm"]:
raise SynapseError(
400,
"Algorithm does not match",
Codes.INVALID_PARAM
)
yield self.store.update_e2e_room_keys_version(user_id, version, version_info)
yield self.store.update_e2e_room_keys_version(user_id, version, version_info)
defer.returnValue({})
defer.returnValue({})