7e4071c117
**Does not yet work!** Currently, state resolution does not correctly resolve conflicting states. Everything else appears to work as expected, so stateres will be fixed soon, then we should be clear for takeoff. Also: a lot of things currently accept a nullable room ID that really just don't need to. This will need tidying up before merge. Some authentication checks have also been disabled temporarily but nothing important. A lot of things are tagged with `TODO(hydra)`, those need resolving before merge. External contributors should PR to the `hydra/public` branch, *not* ` main`. --- This PR should be squash merged. Reviewed-on: https://forgejo.ellis.link/continuwuation/continuwuity/pulls/943 Co-authored-by: nexy7574 <git@nexy7574.co.uk> Co-committed-by: nexy7574 <git@nexy7574.co.uk>
78 lines
2.6 KiB
Rust
78 lines
2.6 KiB
Rust
use conduwuit::{
|
|
Err, Result, debug_warn, implement, matrix::event::gen_event_id_canonical_json, trace,
|
|
};
|
|
use ruma::{
|
|
CanonicalJsonObject, CanonicalJsonValue, OwnedEventId, RoomVersionId, signatures::Verified,
|
|
};
|
|
use serde_json::value::RawValue as RawJsonValue;
|
|
|
|
#[implement(super::Service)]
|
|
pub async fn validate_and_add_event_id(
|
|
&self,
|
|
pdu: &RawJsonValue,
|
|
room_version: &RoomVersionId,
|
|
) -> Result<(OwnedEventId, CanonicalJsonObject)> {
|
|
let (event_id, mut value) = gen_event_id_canonical_json(pdu, room_version)?;
|
|
if let Err(e) = self.verify_event(&value, Some(room_version)).await {
|
|
return Err!(BadServerResponse(debug_error!(
|
|
"Event {event_id} failed verification: {e:?}"
|
|
)));
|
|
}
|
|
|
|
value.insert("event_id".into(), CanonicalJsonValue::String(event_id.as_str().into()));
|
|
|
|
Ok((event_id, value))
|
|
}
|
|
|
|
#[implement(super::Service)]
|
|
pub async fn validate_and_add_event_id_no_fetch(
|
|
&self,
|
|
pdu: &RawJsonValue,
|
|
room_version: &RoomVersionId,
|
|
) -> Result<(OwnedEventId, CanonicalJsonObject)> {
|
|
trace!(?pdu, "Validating PDU without fetching keys");
|
|
let (event_id, mut value) = gen_event_id_canonical_json(pdu, room_version)?;
|
|
trace!(event_id = event_id.as_str(), "Generated event ID, checking required keys");
|
|
if !self.required_keys_exist(&value, room_version).await {
|
|
debug_warn!(
|
|
"Event {event_id} is missing required keys, cannot verify without fetching keys"
|
|
);
|
|
return Err!(BadServerResponse(debug_warn!(
|
|
"Event {event_id} cannot be verified: missing keys."
|
|
)));
|
|
}
|
|
trace!("All required keys exist, verifying event");
|
|
if let Err(e) = self.verify_event(&value, Some(room_version)).await {
|
|
debug_warn!("Event verification failed");
|
|
return Err!(BadServerResponse(debug_error!(
|
|
"Event {event_id} failed verification: {e:?}"
|
|
)));
|
|
}
|
|
trace!("Event verified successfully");
|
|
|
|
value.insert("event_id".into(), CanonicalJsonValue::String(event_id.as_str().into()));
|
|
|
|
Ok((event_id, value))
|
|
}
|
|
|
|
#[implement(super::Service)]
|
|
pub async fn verify_event(
|
|
&self,
|
|
event: &CanonicalJsonObject,
|
|
room_version: Option<&RoomVersionId>,
|
|
) -> Result<Verified> {
|
|
let room_version = room_version.unwrap_or(&RoomVersionId::V12);
|
|
let keys = self.get_event_keys(event, room_version).await?;
|
|
ruma::signatures::verify_event(&keys, event, room_version).map_err(Into::into)
|
|
}
|
|
|
|
#[implement(super::Service)]
|
|
pub async fn verify_json(
|
|
&self,
|
|
event: &CanonicalJsonObject,
|
|
room_version: Option<&RoomVersionId>,
|
|
) -> Result {
|
|
let room_version = room_version.unwrap_or(&RoomVersionId::V12);
|
|
let keys = self.get_event_keys(event, room_version).await?;
|
|
ruma::signatures::verify_json(&keys, event.clone()).map_err(Into::into)
|
|
}
|