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

Fix typechecker problems exposed by signedjson 1.1.2 (#12326)

Browse source
This commit is contained in:
David Robertson 2022-03-29 22:37:50 +01:00 • committed by GitHub
parent 1f32b90b0f
commit e0bb268134
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 38 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

8
synapse/rest/key/v2/remote_key_resource.py
View file

@ -13,7 +13,7 @@
# limitations under the License.
import logging
from typing import TYPE_CHECKING, Dict
from typing import TYPE_CHECKING, Dict, Set
from signedjson.sign import sign_json
@ -149,7 +149,7 @@ class RemoteKey(DirectServeJsonResource):
cached = await self.store.get_server_keys_json(store_queries)
json_results = set()
json_results: Set[bytes] = set()
time_now_ms = self.clock.time_msec()
@ -234,8 +234,8 @@ class RemoteKey(DirectServeJsonResource):
await self.query_keys(request, query, query_remote_on_cache_miss=False)
else:
signed_keys = []
for key_json in json_results:
key_json = json_decoder.decode(key_json.decode("utf-8"))
for key_json_raw in json_results:
key_json = json_decoder.decode(key_json_raw.decode("utf-8"))
for signing_key in self.config.key.key_server_signing_keys:
key_json = sign_json(
key_json, self.config.server.server_name, signing_key