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

Delete e2e keys on device delete

Browse source
This commit is contained in:
Richard van der Hoff 2016-07-27 12:18:03 +01:00
parent 2e3d90d67c
commit d47115ff8b
3 changed files with 28 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
synapse/rest/client/v2_alpha/keys.py
View file

@ -86,10 +86,6 @@ class KeyUploadServlet(RestServlet):
raise synapse.api.errors.SynapseError(
400, "Can only upload keys for current device"
)
self.device_handler.check_device_registered(
user_id, device_id, "unknown device"
)
else:
device_id = requester.device_id
@ -131,6 +127,15 @@ class KeyUploadServlet(RestServlet):
user_id, device_id, time_now, key_list
)
# the device should have been registered already, but it may have been
# deleted due to a race with a DELETE request. Or we may be using an
# old access_token without an associated device_id. Either way, we
# need to double-check the device is registered to avoid ending up with
# keys without a corresponding device.
self.device_handler.check_device_registered(
user_id, device_id, "unknown device"
)
result = yield self.store.count_e2e_one_time_keys(user_id, device_id)
defer.returnValue((200, {"one_time_key_counts": result}))