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

Modify StoreKeyFetcher to read from server_keys_json. #15417

Merged
merged 8 commits into from
Apr 20, 2023
Merged

Modify StoreKeyFetcher to read from server_keys_json. #15417

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1270a5d
Rename some methods.
clokep Mar 10, 2023
9d2c890
Rename get_server_keys_json to get_server_keys_json_for_remote.
clokep Apr 10, 2023
400ba67
Modify StoreKeyFetcher to read from server_keys_json.
clokep Apr 10, 2023
de96650
Fix-up other tests.
clokep Apr 11, 2023
6679a5e
Disable using matrix.org as a trusted key server in unit tests.
clokep Apr 11, 2023
bbef2a6
Only create a PerspectivesKeyFetcher if one is needed.
clokep Apr 11, 2023
7f676a4
FIx tests on postgres.
clokep Apr 11, 2023
7ab918c
Merge remote-tracking branch 'origin/develop' into clokep/store-fetcher
clokep Apr 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion synapse/storage/databases/main/keys.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ def _get_keys(txn: Cursor, batch: Tuple[Tuple[str, str], ...]) -> None:

# The entire signed JSON response is stored in server_keys_json,
# fetch out the bits needed.
key_json = json.loads(key_json_bytes)
key_json = json.loads(bytes(key_json_bytes))
DMRobertson marked this conversation as resolved.
Show resolved Hide resolved
key_base64 = key_json["verify_keys"][key_id]["key"]

keys[(server_name, key_id)] = FetchKeyResult(
Expand Down