chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

federation-api: Allow old_verify_keys to be missing when deserializing ServerSigningKeys

Browse Source
This commit is contained in:
Kévin Commaille 2024-08-14 16:02:09 +02:00 committed by Kévin Commaille
parent 12a2e9342b
commit b7059ddd18
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crates/ruma-federation-api/CHANGELOG.md
View File

@ -1,5 +1,10 @@
# [unreleased] # [unreleased]
Bug fixes:
- `ServerSigningKeys` can be deserialized when `old_verify_keys` is missing, due to a
clarification in the spec.
Improvements: Improvements:
- Add support for authenticated media endpoints, according to MSC3916 / Matrix 1.11 - Add support for authenticated media endpoints, according to MSC3916 / Matrix 1.11

4
crates/ruma-federation-api/src/discovery.rs
View File

@ -48,7 +48,6 @@ impl OldVerifyKey {
} }
} }
// Spec is wrong, all fields are required (see https://github.com/matrix-org/matrix-spec/issues/613)
/// Queried server key, signed by the notary server. /// Queried server key, signed by the notary server.
#[derive(Clone, Debug, Deserialize, Serialize)] #[derive(Clone, Debug, Deserialize, Serialize)]
#[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)] #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
@ -60,6 +59,9 @@ pub struct ServerSigningKeys {
pub verify_keys: BTreeMap<OwnedServerSigningKeyId, VerifyKey>, pub verify_keys: BTreeMap<OwnedServerSigningKeyId, VerifyKey>,
/// Public keys that the homeserver used to use and when it stopped using them. /// Public keys that the homeserver used to use and when it stopped using them.
// This field is optional, but all fields were assumed to be required before clarification
// in https://github.com/matrix-org/matrix-spec/pull/1930, so we still send it.
#[serde(default)]
pub old_verify_keys: BTreeMap<OwnedServerSigningKeyId, OldVerifyKey>, pub old_verify_keys: BTreeMap<OwnedServerSigningKeyId, OldVerifyKey>,
/// Digital signatures of this object signed using the verify_keys. /// Digital signatures of this object signed using the verify_keys.