tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Don't reuse backup versions

Browse source 
Since we don't actually delete the keys, just mark the versions
as deleted in the db rather than actually deleting them, then we
won't reuse versions.

Fixes https://github.com/vector-im/riot-web/issues/7448
This commit is contained in:
David Baker 2018-10-05 15:08:36 +01:00
parent bc74925c5b
commit 497444f1fd
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
synapse/storage/e2e_room_keys.py
View file

@ -193,7 +193,8 @@ class EndToEndRoomKeyStore(SQLBaseStore):
@staticmethod @staticmethod
def _get_current_version(txn, user_id): def _get_current_version(txn, user_id):
txn.execute( txn.execute(
"SELECT MAX(version) FROM e2e_room_keys_versions WHERE user_id=?", "SELECT MAX(version) FROM e2e_room_keys_versions "
"WHERE user_id=? AND deleted=0",
(user_id,) (user_id,)
) )
row = txn.fetchone() row = txn.fetchone()
@ -226,6 +227,7 @@ class EndToEndRoomKeyStore(SQLBaseStore):
keyvalues={ keyvalues={
"user_id": user_id, "user_id": user_id,
"version": this_version, "version": this_version,
"deleted": 0,
}, },
retcols=( retcols=(
"version", "version",
@ -300,13 +302,16 @@ class EndToEndRoomKeyStore(SQLBaseStore):
else: else:
this_version = version this_version = version
return self._simple_delete_one_txn( return self._simple_update_one_txn(
txn, txn,
table="e2e_room_keys_versions", table="e2e_room_keys_versions",
keyvalues={ keyvalues={
"user_id": user_id, "user_id": user_id,
"version": this_version, "version": this_version,
}, },
updatevalues={
"deleted": 1,
}
) )
return self.runInteraction( return self.runInteraction(

3
synapse/storage/schema/delta/51/e2e_room_keys.sql
View file

@ -32,7 +32,8 @@ CREATE TABLE e2e_room_keys_versions (
user_id TEXT NOT NULL, user_id TEXT NOT NULL,
version TEXT NOT NULL, version TEXT NOT NULL,
algorithm TEXT NOT NULL, algorithm TEXT NOT NULL,
auth_data TEXT NOT NULL auth_data TEXT NOT NULL,
deleted SMALLINT DEFAULT 0 NOT NULL
); );
CREATE UNIQUE INDEX e2e_room_keys_versions_idx ON e2e_room_keys_versions(user_id, version); CREATE UNIQUE INDEX e2e_room_keys_versions_idx ON e2e_room_keys_versions(user_id, version);