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

E2E keys: Make federation query share code with client query

Browse source 
Refactor the e2e query handler to separate out the local query, and then make
the federation handler use it.
This commit is contained in:
Richard van der Hoff 2016-08-02 18:06:31 +01:00
parent 986615b0b2
commit 1efee2f52b
3 changed files with 92 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

20
synapse/federation/federation_server.py
View file

@ -348,27 +348,9 @@ class FederationServer(FederationBase):
(200, send_content)
)
@defer.inlineCallbacks
@log_function
def on_query_client_keys(self, origin, content):
query = []
for user_id, device_ids in content.get("device_keys", {}).items():
if not device_ids:
query.append((user_id, None))
else:
for device_id in device_ids:
query.append((user_id, device_id))
results = yield self.store.get_e2e_device_keys(query)
json_result = {}
for user_id, device_keys in results.items():
for device_id, json_bytes in device_keys.items():
json_result.setdefault(user_id, {})[device_id] = json.loads(
json_bytes
)
defer.returnValue({"device_keys": json_result})
return self.on_query_request("client_keys", content)
@defer.inlineCallbacks
@log_function