Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add a few strategic new lines to break up the on_query_client_keys and on_claim_client_keys methods in federation_server.py

This commit is contained in:
Mark Haines 2015-08-13 17:27:46 +01:00
parent 2da3b1e60b
commit 0cceb2ac92
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
synapse/federation/federation_server.py
View File

@ -323,13 +323,16 @@ class FederationServer(FederationBase):
else: else:
for device_id in device_ids: for device_id in device_ids:
query.append((user_id, device_id)) query.append((user_id, device_id))
results = yield self.store.get_e2e_device_keys(query) results = yield self.store.get_e2e_device_keys(query)
json_result = {} json_result = {}
for user_id, device_keys in results.items(): for user_id, device_keys in results.items():
for device_id, json_bytes in device_keys.items(): for device_id, json_bytes in device_keys.items():
json_result.setdefault(user_id, {})[device_id] = json.loads( json_result.setdefault(user_id, {})[device_id] = json.loads(
json_bytes json_bytes
) )
defer.returnValue({"device_keys": json_result}) defer.returnValue({"device_keys": json_result})
@defer.inlineCallbacks @defer.inlineCallbacks
@ -339,7 +342,9 @@ class FederationServer(FederationBase):
for user_id, device_keys in content.get("one_time_keys", {}).items(): for user_id, device_keys in content.get("one_time_keys", {}).items():
for device_id, algorithm in device_keys.items(): for device_id, algorithm in device_keys.items():
query.append((user_id, device_id, algorithm)) query.append((user_id, device_id, algorithm))
results = yield self.store.claim_e2e_one_time_keys(query) results = yield self.store.claim_e2e_one_time_keys(query)
json_result = {} json_result = {}
for user_id, device_keys in results.items(): for user_id, device_keys in results.items():
for device_id, keys in device_keys.items(): for device_id, keys in device_keys.items():
@ -347,6 +352,7 @@ class FederationServer(FederationBase):
json_result.setdefault(user_id, {})[device_id] = { json_result.setdefault(user_id, {})[device_id] = {
key_id: json.loads(json_bytes) key_id: json.loads(json_bytes)
} }
defer.returnValue({"one_time_keys": json_result}) defer.returnValue({"one_time_keys": json_result})
@defer.inlineCallbacks @defer.inlineCallbacks