studio/tuwunel
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup validate/verify suite room version related; optimize event_id insert. (#12)

Browse Source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk
2025-09-01 00:05:20 +00:00
parent 13c9385ef7
commit 685946faed
1 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/service/server_keys/verify.rs
View File

@@ -2,17 +2,21 @@ use ruma::{
CanonicalJsonObject, CanonicalJsonValue, OwnedEventId, RoomVersionId, signatures::Verified, CanonicalJsonObject, CanonicalJsonValue, OwnedEventId, RoomVersionId, signatures::Verified,
}; };
use serde_json::value::RawValue as RawJsonValue; use serde_json::value::RawValue as RawJsonValue;
use tuwunel_core::{Err, Result, err, implement, matrix::event::gen_event_id_canonical_json}; use tuwunel_core::{
Err, Result, implement,
matrix::{event::gen_event_id_canonical_json, room_version},
};
#[implement(super::Service)] #[implement(super::Service)]
pub async fn validate_and_add_event_id( pub async fn validate_and_add_event_id(
&self, &self,
pdu: &RawJsonValue, pdu: &RawJsonValue,
room_version: &RoomVersionId, room_version_id: &RoomVersionId,
) -> Result<(OwnedEventId, CanonicalJsonObject)> { ) -> Result<(OwnedEventId, CanonicalJsonObject)> {
let (event_id, mut value) = gen_event_id_canonical_json(pdu, room_version)?; let (event_id, mut value) = gen_event_id_canonical_json(pdu, room_version_id)?;
if let Err(e) = self if let Err(e) = self
.verify_event(&value, Some(room_version)) .verify_event(&value, Some(room_version_id))
.await .await
{ {
return Err!(BadServerResponse(debug_error!( return Err!(BadServerResponse(debug_error!(
@@ -20,7 +24,13 @@ pub async fn validate_and_add_event_id(
))); )));
} }
value.insert("event_id".into(), CanonicalJsonValue::String(event_id.as_str().into())); // For v3+ rooms we add the event_id, but for v1/v2 rooms it's already present.
if !room_version::rules(room_version_id)?
.event_format
.require_event_id
{
value.insert("event_id".into(), CanonicalJsonValue::String(event_id.as_str().into()));
}
Ok((event_id, value)) Ok((event_id, value))
} }
@@ -29,14 +39,10 @@ pub async fn validate_and_add_event_id(
pub async fn validate_and_add_event_id_no_fetch( pub async fn validate_and_add_event_id_no_fetch(
&self, &self,
pdu: &RawJsonValue, pdu: &RawJsonValue,
room_version: &RoomVersionId, room_version_id: &RoomVersionId,
) -> Result<(OwnedEventId, CanonicalJsonObject)> { ) -> Result<(OwnedEventId, CanonicalJsonObject)> {
let (event_id, mut value) = gen_event_id_canonical_json(pdu, room_version)?; let (event_id, mut value) = gen_event_id_canonical_json(pdu, room_version_id)?;
let room_version_rules = room_version.rules().ok_or_else(|| { let room_version_rules = room_version::rules(room_version_id)?;
err!(Request(UnsupportedRoomVersion(
"Cannot verify event for unknown room version {room_version:?}."
)))
})?;
if !self if !self
.required_keys_exist(&value, &room_version_rules) .required_keys_exist(&value, &room_version_rules)
@@ -48,7 +54,7 @@ pub async fn validate_and_add_event_id_no_fetch(
} }
if let Err(e) = self if let Err(e) = self
.verify_event(&value, Some(room_version)) .verify_event(&value, Some(room_version_id))
.await .await
{ {
return Err!(BadServerResponse(debug_error!( return Err!(BadServerResponse(debug_error!(
@@ -56,7 +62,10 @@ pub async fn validate_and_add_event_id_no_fetch(
))); )));
} }
value.insert("event_id".into(), CanonicalJsonValue::String(event_id.as_str().into())); // For v3+ rooms we add the event_id, but for v1/v2 rooms it's already present.
if !room_version_rules.event_format.require_event_id {
value.insert("event_id".into(), CanonicalJsonValue::String(event_id.as_str().into()));
}
Ok((event_id, value)) Ok((event_id, value))
} }
@@ -65,14 +74,10 @@ pub async fn validate_and_add_event_id_no_fetch(
pub async fn verify_event( pub async fn verify_event(
&self, &self,
event: &CanonicalJsonObject, event: &CanonicalJsonObject,
room_version: Option<&RoomVersionId>, room_version_id: Option<&RoomVersionId>,
) -> Result<Verified> { ) -> Result<Verified> {
let room_version = room_version.unwrap_or(&RoomVersionId::V11); let room_version_id = room_version_id.unwrap_or(&RoomVersionId::V11);
let room_version_rules = room_version.rules().ok_or_else(|| { let room_version_rules = room_version::rules(room_version_id)?;
err!(Request(UnsupportedRoomVersion(
"Cannot verify event for unknown room version {room_version:?}."
)))
})?;
let event_keys = self let event_keys = self
.get_event_keys(event, &room_version_rules) .get_event_keys(event, &room_version_rules)
@@ -85,14 +90,10 @@ pub async fn verify_event(
pub async fn verify_json( pub async fn verify_json(
&self, &self,
event: &CanonicalJsonObject, event: &CanonicalJsonObject,
room_version: Option<&RoomVersionId>, room_version_id: Option<&RoomVersionId>,
) -> Result { ) -> Result {
let room_version = room_version.unwrap_or(&RoomVersionId::V11); let room_version_id = room_version_id.unwrap_or(&RoomVersionId::V11);
let room_version_rules = room_version.rules().ok_or_else(|| { let room_version_rules = room_version::rules(room_version_id)?;
err!(Request(UnsupportedRoomVersion(
"Cannot verify json for unknown room version {room_version:?}."
)))
})?;
let event_keys = self let event_keys = self
.get_event_keys(event, &room_version_rules) .get_event_keys(event, &room_version_rules)