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

make /room_keys/version work

Browse source
This commit is contained in:
Matthew Hodgson 2017-12-06 10:02:49 +01:00 • committed by Hubert Chathi
parent 8ae64b270f
commit 69e51c7ba4
4 changed files with 38 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

22
synapse/storage/e2e_room_keys.py
View file

@ -172,7 +172,7 @@ class EndToEndRoomKeyStore(SQLBaseStore):
)
@defer.inlineCallbacks
def get_e2e_room_key_version(self, user_id, version):
def get_e2e_room_key_version_info(self, user_id, version):
row = yield self._simple_select_one(
table="e2e_room_key_versions",
@ -191,23 +191,35 @@ class EndToEndRoomKeyStore(SQLBaseStore):
defer.returnValue(row)
def create_e2e_room_key_version(self, user_id, version, info):
def create_e2e_room_key_version(self, user_id, info):
"""Atomically creates a new version of this user's e2e_room_keys store
with the given version info.
"""
def _create_e2e_room_key_version_txn(txn):
txn.execute(
"SELECT MAX(version) FROM e2e_room_key_versions WHERE user_id=?",
(user_id,)
)
current_version = txn.fetchone()[0]
if current_version is None:
current_version = 0
new_version = current_version + 1
self._simple_insert_txn(
txn,
table="e2e_room_key_versions",
values={
"user_id": user_id,
"version": version,
"version": new_version,
"algorithm": info["algorithm"],
"auth_data": info["auth_data"],
},
lock=False,
)
return True
return new_version
return self.runInteraction(
"create_e2e_room_key_version_txn", _create_e2e_room_key_version_txn