oss/conduit
oss/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2025-09-05 18:41:00 +00:00
Code Wiki Activity

Merge branch 'fix-key-fetching-on-join' into 'next'

Browse source 
fix: various issues around key fetching (especially on send_join)

See merge request famedly/conduit!767
This commit is contained in:
Matthias Ahouansou 2025-07-13 19:43:14 +00:00
commit 8e8c753384
2 changed files with 36 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/database/key_value/globals.rs
View file

@ -255,12 +255,16 @@ lasttimelinecount_cache: {lasttimelinecount_cache}\n"
let ServerSigningKeys {
verify_keys,
old_verify_keys,
valid_until_ts,
..
} = new_keys;
prev_keys.verify_keys.extend(verify_keys);
prev_keys.old_verify_keys.extend(old_verify_keys);
prev_keys.valid_until_ts = new_keys.valid_until_ts;
if valid_until_ts > prev_keys.valid_until_ts {
prev_keys.valid_until_ts = valid_until_ts;
}
self.server_signingkeys.insert(
origin.as_bytes(),

38
src/service/rooms/event_handler/mod.rs
View file

@ -1494,6 +1494,27 @@ impl Service {
}
}
let origin_server_ts = value.get("origin_server_ts").ok_or_else(|| {
error!("Invalid PDU, no origin_server_ts field");
Error::BadRequest(
ErrorKind::MissingParam,
"Invalid PDU, no origin_server_ts field",
)
})?;
let origin_server_ts: MilliSecondsSinceUnixEpoch = {
let ts = origin_server_ts.as_integer().ok_or_else(|| {
Error::BadRequest(
ErrorKind::InvalidParam,
"origin_server_ts must be an integer",
)
})?;
MilliSecondsSinceUnixEpoch(i64::from(ts).try_into().map_err(|_| {
Error::BadRequest(ErrorKind::InvalidParam, "Time must be after the unix epoch")
})?)
};
let signatures = value
.get("signatures")
.ok_or(Error::BadServerResponse(
@ -1513,15 +1534,16 @@ impl Service {
let contains_all_ids = |keys: &SigningKeys| {
signature_ids.iter().all(|id| {
keys.verify_keys
.keys()
.map(ToString::to_string)
.any(|key_id| id == &key_id)
|| keys
.old_verify_keys
(keys.valid_until_ts > origin_server_ts
&& keys
.verify_keys
.keys()
.map(ToString::to_string)
.any(|key_id| id == &key_id)
.any(|key_id| id == &key_id))
|| keys
.old_verify_keys
.iter()
.any(|(key_id, key)| key_id == id && key.expired_ts > origin_server_ts)
})
};
@ -1542,6 +1564,8 @@ impl Service {
}
pub_key_map.insert(origin.to_string(), result);
} else {
servers.insert(origin.to_owned(), BTreeMap::new());
}
}