OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Only remove one time keys when new one time keys are added

pull/198/head
Mark Haines 2015-07-08 17:04:29 +01:00
parent 28ef344077
commit 8fb79eeea4
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
synapse/storage/end_to_end_keys.py
View File

@ -58,6 +58,11 @@ class EndToEndKeyStore(SQLBaseStore):
def add_e2e_one_time_keys(self, user_id, device_id, time_now, valid_until,
key_list):
def _add_e2e_one_time_keys(txn):
sql = (
"DELETE FROM e2e_one_time_keys_json"
" WHERE user_id = ? AND device_id = ? AND valid_until_ms < ?"
)
txn.execute(sql, (user_id, device_id, time_now))
for (algorithm, key_id, json_bytes) in key_list:
self._simple_upsert_txn(
txn, table="e2e_one_time_keys_json",
@ -83,17 +88,12 @@ class EndToEndKeyStore(SQLBaseStore):
Dict mapping from algorithm to number of keys for that algorithm.
"""
def _count_e2e_one_time_keys(txn):
sql = (
"DELETE FROM e2e_one_time_keys_json"
" WHERE user_id = ? AND device_id = ? AND valid_until_ms < ?"
)
txn.execute(sql, (user_id, device_id, time_now))
sql = (
"SELECT algorithm, COUNT(key_id) FROM e2e_one_time_keys_json"
" WHERE user_id = ? AND device_id = ?"
" WHERE user_id = ? AND device_id = ? AND valid_until_ms >= ?"
" GROUP BY algorithm"
)
txn.execute(sql, (user_id, device_id))
txn.execute(sql, (user_id, device_id, time_now))
result = {}
for algorithm, key_count in txn.fetchall():
result[algorithm] = key_count