Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Commit

Permalink
make black happy
Browse files Browse the repository at this point in the history
  • Loading branch information
@uhoreg
uhoreg committed Jul 25, 2019
1 parent f0ae0cb commit 9c2bc3a
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 37 deletions.
16 changes: 9 additions & 7 deletions synapse/handlers/device.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -433,13 +433,15 @@ def on_federation_query_user_devices(self, user_id):
user_id, "self_signing"
)

defer.returnValue({
"user_id": user_id,
"stream_id": stream_id,
"devices": devices,
"master_key": master_key,
"self_signing_key": self_signing_key
})
defer.returnValue(
{
"user_id": user_id,
"stream_id": stream_id,
"devices": devices,
"master_key": master_key,
"self_signing_key": self_signing_key,
}
)

@defer.inlineCallbacks
def user_left_room(self, user, room_id):
Expand Down
16 changes: 8 additions & 8 deletions synapse/handlers/e2e_keys.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def __init__(self, hs):
federation_registry = hs.get_federation_registry()

federation_registry.register_edu_handler(
"m.signing_key_update", self._edu_updater.incoming_signing_key_update,
"m.signing_key_update", self._edu_updater.incoming_signing_key_update
)
# doesn't really work as part of the generic query API, because the
# query request requires an object POST, but we abuse the
Expand Down Expand Up @@ -298,9 +298,7 @@ def on_federation_query_client_keys(self, query_body):
"""
device_keys_query = query_body.get("device_keys", {})
device_keys = yield self.query_local_devices(device_keys_query)
ret = {
"device_keys": device_keys,
}
ret = {"device_keys": device_keys}

# add in the cross-signing keys
cross_signing_keys = yield self.query_cross_signing_keys(device_keys_query)
Expand Down Expand Up @@ -970,15 +968,17 @@ def _handle_signing_key_updates(self, user_id):
yield self.store.set_e2e_cross_signing_key(
user_id, "master", master_key
)
device_id = \
get_verify_key_from_cross_signing_key(master_key)[1].version
device_id = get_verify_key_from_cross_signing_key(master_key)[
1
].version
device_ids.append(device_id)
if self_signing_key:
yield self.store.set_e2e_cross_signing_key(
user_id, "self_signing", self_signing_key
)
device_id = \
get_verify_key_from_cross_signing_key(self_signing_key)[1].version
device_id = get_verify_key_from_cross_signing_key(self_signing_key)[
1
].version
device_ids.append(device_id)

yield device_handler.notify_device_update(user_id, device_ids)
54 changes: 32 additions & 22 deletions synapse/storage/devices.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
from synapse.metrics.background_process_metrics import run_as_background_process
from synapse.storage._base import Cache, SQLBaseStore, db_to_json
from synapse.storage.background_updates import BackgroundUpdateStore
from synapse.types import get_verify_key_from_cross_signing_key
from synapse.util import batch_iter
from synapse.util.caches.descriptors import cached, cachedInlineCallbacks, cachedList

Expand Down Expand Up @@ -132,17 +133,19 @@ def get_devices_by_remote(self, destination, from_stream_id, limit):
)
master_key_by_user[user] = {
"key_info": cross_signing_key,
"pubkey": verify_key.version
"pubkey": verify_key.version,
}

cross_signing_key = yield self.get_e2e_cross_signing_key(user, "self_signing")
cross_signing_key = yield self.get_e2e_cross_signing_key(
user, "self_signing"
)
if cross_signing_key:
key_id, verify_key = get_verify_key_from_cross_signing_key(
cross_signing_key
)
self_signing_key_by_user[user] = {
"key_info": cross_signing_key,
"pubkey": verify_key.version
"pubkey": verify_key.version,
}

# if we have exceeded the limit, we need to exclude any results with the
Expand All @@ -168,10 +171,13 @@ def get_devices_by_remote(self, destination, from_stream_id, limit):
break

# skip over cross-signing keys
if (update[0] in master_key_by_user
and update[1] == master_key_by_user[update[0]]["pubkey"]) \
or (update[0] in master_key_by_user
and update[1] == self_signing_key_by_user[update[0]]["pubkey"]):
if (
update[0] in master_key_by_user
and update[1] == master_key_by_user[update[0]]["pubkey"]
) or (
update[0] in master_key_by_user
and update[1] == self_signing_key_by_user[update[0]]["pubkey"]
):
continue

key = (update[0], update[1])
Expand All @@ -185,16 +191,16 @@ def get_devices_by_remote(self, destination, from_stream_id, limit):
# update list with the master/self-signing key by user maps
cross_signing_keys_by_user = {}
for user_id, device_id, stream in updates:
if device_id == master_key_by_user.get(user_id, {}) \
.get("pubkey", None):
if device_id == master_key_by_user.get(user_id, {}).get("pubkey", None):
result = cross_signing_keys_by_user.setdefault(user_id, {})
result["master_key"] = \
master_key_by_user[user_id]["key_info"]
elif device_id == self_signing_key_by_user.get(user_id, {}) \
.get("pubkey", None):
result["master_key"] = master_key_by_user[user_id]["key_info"]
elif device_id == self_signing_key_by_user.get(user_id, {}).get(
"pubkey", None
):
result = cross_signing_keys_by_user.setdefault(user_id, {})
result["self_signing_key"] = \
self_signing_key_by_user[user_id]["key_info"]
result["self_signing_key"] = self_signing_key_by_user[user_id][
"key_info"
]

cross_signing_results = []

Expand Down Expand Up @@ -257,13 +263,17 @@ def _get_device_update_edus_by_remote(self, destination, from_stream_id, query_m
List[Dict]: List of objects representing an device update EDU
"""
devices = yield self.runInteraction(
"_get_e2e_device_keys_txn",
self._get_e2e_device_keys_txn,
query_map.keys(),
include_all_devices=True,
include_deleted_devices=True,
) if query_map else {}
devices = (
yield self.runInteraction(
"_get_e2e_device_keys_txn",
self._get_e2e_device_keys_txn,
query_map.keys(),
include_all_devices=True,
include_deleted_devices=True,
)
if query_map
else {}
)

results = []
for user_id, user_devices in iteritems(devices):
Expand Down

0 comments on commit 9c2bc3a

Please sign in to comment.