mirror of
https://forgejo.ellis.link/continuwuation/continuwuity.git
synced 2026-05-26 20:49:55 +00:00
refactor: Ruma upstraming, bake a little more
This commit is contained in:
Jade Ellis
Ginger
+127
-84
@@ -1,117 +1,160 @@
|
||||
use std::collections::{BTreeMap, BTreeSet};
|
||||
|
||||
use ruma::{CanonicalJsonObject, CanonicalJsonValue, OwnedEventId, OwnedServerName, OwnedServerSigningKeyId, RoomVersionId, UserId, canonical_json::JsonType, signatures::{Error, JsonError, ParseError}};
|
||||
use ruma::{
|
||||
CanonicalJsonObject, CanonicalJsonValue, IdParseError, OwnedEventId, OwnedServerName, OwnedServerSigningKeyId, RoomVersionId, UserId, canonical_json::JsonType, signatures::{JsonError, VerificationError}
|
||||
};
|
||||
|
||||
/// Whether the given event is an `m.room.member` invite that was created as the result of a
|
||||
/// third-party invite.
|
||||
/// Whether the given event is an `m.room.member` invite that was created as the
|
||||
/// result of a third-party invite.
|
||||
///
|
||||
/// Returns an error if the object has not the expected format of an `m.room.member` event.
|
||||
pub(super) fn is_invite_via_third_party_id(object: &CanonicalJsonObject) -> Result<bool, Error> {
|
||||
let Some(CanonicalJsonValue::String(raw_type)) = object.get("type") else {
|
||||
return Err(JsonError::NotOfType { target: "type".to_owned(), of_type: JsonType::String }.into());
|
||||
};
|
||||
/// Returns an error if the object has not the expected format of an
|
||||
/// `m.room.member` event.
|
||||
pub(super) fn is_invite_via_third_party_id(object: &CanonicalJsonObject) -> Result<bool, JsonError> {
|
||||
let Some(CanonicalJsonValue::String(raw_type)) = object.get("type") else {
|
||||
return Err(JsonError::NotOfType {
|
||||
target: "type".to_owned(),
|
||||
of_type: JsonType::String,
|
||||
}
|
||||
.into());
|
||||
};
|
||||
|
||||
if raw_type != "m.room.member" {
|
||||
return Ok(false);
|
||||
}
|
||||
if raw_type != "m.room.member" {
|
||||
return Ok(false);
|
||||
}
|
||||
|
||||
let Some(CanonicalJsonValue::Object(content)) = object.get("content") else {
|
||||
return Err(JsonError::NotOfType { target: "content".to_owned(), of_type: JsonType::Object }.into());
|
||||
};
|
||||
let Some(CanonicalJsonValue::Object(content)) = object.get("content") else {
|
||||
return Err(JsonError::NotOfType {
|
||||
target: "content".to_owned(),
|
||||
of_type: JsonType::Object,
|
||||
}
|
||||
.into());
|
||||
};
|
||||
|
||||
let Some(CanonicalJsonValue::String(membership)) = content.get("membership") else {
|
||||
return Err(JsonError::NotOfType { target: "membership".to_owned(), of_type: JsonType::String }.into());
|
||||
};
|
||||
let Some(CanonicalJsonValue::String(membership)) = content.get("membership") else {
|
||||
return Err(JsonError::NotOfType {
|
||||
target: "membership".to_owned(),
|
||||
of_type: JsonType::String,
|
||||
}
|
||||
.into());
|
||||
};
|
||||
|
||||
if membership != "invite" {
|
||||
return Ok(false);
|
||||
}
|
||||
if membership != "invite" {
|
||||
return Ok(false);
|
||||
}
|
||||
|
||||
match content.get("third_party_invite") {
|
||||
Some(CanonicalJsonValue::Object(_)) => Ok(true),
|
||||
None => Ok(false),
|
||||
_ => Err(JsonError::NotOfType { target: "third_party_invite".to_owned(), of_type: JsonType::Object }.into()),
|
||||
}
|
||||
match content.get("third_party_invite") {
|
||||
| Some(CanonicalJsonValue::Object(_)) => Ok(true),
|
||||
| None => Ok(false),
|
||||
| _ => Err(JsonError::NotOfType {
|
||||
target: "third_party_invite".to_owned(),
|
||||
of_type: JsonType::Object,
|
||||
}
|
||||
.into()),
|
||||
}
|
||||
}
|
||||
|
||||
/// Extracts the server names to check signatures for given event.
|
||||
///
|
||||
/// Respects the rules for [validating signatures on received events] for populating the result:
|
||||
/// Respects the rules for [validating signatures on received events] for
|
||||
/// populating the result:
|
||||
///
|
||||
/// - Add the server of the sender, except if it's an invite event that results from a third-party
|
||||
/// invite.
|
||||
/// - Add the server of the sender, except if it's an invite event that results
|
||||
/// from a third-party invite.
|
||||
/// - For room versions 1 and 2, add the server of the `event_id`.
|
||||
/// - For room versions that support restricted join rules, if it's a join event with a
|
||||
/// `join_authorised_via_users_server`, add the server of that user.
|
||||
/// - For room versions that support restricted join rules, if it's a join event
|
||||
/// with a `join_authorised_via_users_server`, add the server of that user.
|
||||
///
|
||||
/// [validating signatures on received events]: https://spec.matrix.org/latest/server-server-api/#validating-hashes-and-signatures-on-received-events
|
||||
pub fn servers_to_check_signatures(
|
||||
object: &CanonicalJsonObject,
|
||||
version: &RoomVersionId,
|
||||
) -> Result<BTreeSet<OwnedServerName>, Error> {
|
||||
let mut servers_to_check = BTreeSet::new();
|
||||
object: &CanonicalJsonObject,
|
||||
version: &RoomVersionId,
|
||||
) -> Result<BTreeSet<OwnedServerName>, VerificationError> {
|
||||
let mut servers_to_check = BTreeSet::new();
|
||||
|
||||
if !is_invite_via_third_party_id(object)? {
|
||||
match object.get("sender") {
|
||||
Some(CanonicalJsonValue::String(raw_sender)) => {
|
||||
let user_id = <&UserId>::try_from(raw_sender.as_str())
|
||||
.map_err(|e| Error::from(ParseError::UserId(e)))?;
|
||||
if !is_invite_via_third_party_id(object)? {
|
||||
match object.get("sender") {
|
||||
| Some(CanonicalJsonValue::String(raw_sender)) => {
|
||||
let user_id = <&UserId>::try_from(raw_sender.as_str()).map_err(|source| {VerificationError::ParseIdentifier {
|
||||
identifier_type: "user ID",
|
||||
source,
|
||||
}
|
||||
})?;
|
||||
|
||||
servers_to_check.insert(user_id.server_name().to_owned());
|
||||
}
|
||||
_ => return Err(JsonError::NotOfType { target: "sender".to_owned(), of_type: JsonType::String }.into()),
|
||||
};
|
||||
}
|
||||
servers_to_check.insert(user_id.server_name().to_owned());
|
||||
},
|
||||
| _ =>
|
||||
return Err(JsonError::NotOfType {
|
||||
target: "sender".to_owned(),
|
||||
of_type: JsonType::String,
|
||||
}
|
||||
.into()),
|
||||
};
|
||||
}
|
||||
|
||||
match version {
|
||||
RoomVersionId::V1 | RoomVersionId::V2 => match object.get("event_id") {
|
||||
Some(CanonicalJsonValue::String(raw_event_id)) => {
|
||||
let event_id: OwnedEventId =
|
||||
raw_event_id.parse().map_err(|e| Error::from(ParseError::EventId(e)))?;
|
||||
match version {
|
||||
| RoomVersionId::V1 | RoomVersionId::V2 => match object.get("event_id") {
|
||||
| Some(CanonicalJsonValue::String(raw_event_id)) => {
|
||||
let event_id: OwnedEventId = raw_event_id.parse().map_err(|source| {
|
||||
VerificationError::ParseIdentifier {
|
||||
identifier_type: "event ID",
|
||||
source,
|
||||
}
|
||||
})?;
|
||||
|
||||
let server_name = event_id
|
||||
.server_name()
|
||||
.ok_or_else(|| ParseError::ServerNameFromEventId(event_id.to_owned()))?
|
||||
.to_owned();
|
||||
let server_name = event_id
|
||||
.server_name()
|
||||
.ok_or_else(|| VerificationError::ParseIdentifier {
|
||||
identifier_type: "event ID",
|
||||
source: IdParseError::InvalidServerName,
|
||||
})?
|
||||
.to_owned();
|
||||
|
||||
servers_to_check.insert(server_name);
|
||||
}
|
||||
_ => {
|
||||
return Err(JsonError::JsonFieldMissingFromObject("event_id".to_owned()).into());
|
||||
}
|
||||
},
|
||||
RoomVersionId::V3
|
||||
| RoomVersionId::V4
|
||||
| RoomVersionId::V5
|
||||
| RoomVersionId::V6
|
||||
| RoomVersionId::V7 => {}
|
||||
// TODO: And for all future versions that have join_authorised_via_users_server
|
||||
RoomVersionId::V8 | RoomVersionId::V9 | RoomVersionId::V10 | RoomVersionId::V11 | RoomVersionId::V12 => {
|
||||
if let Some(authorized_user) = object
|
||||
.get("content")
|
||||
.and_then(|c| c.as_object())
|
||||
.and_then(|c| c.get("join_authorised_via_users_server"))
|
||||
{
|
||||
let authorized_user = authorized_user.as_str().ok_or_else(|| -> Error {
|
||||
JsonError::NotOfType { target: "join_authorised_via_users_server".to_owned(), of_type: JsonType::String }.into()
|
||||
})?;
|
||||
let authorized_user = <&UserId>::try_from(authorized_user)
|
||||
.map_err(|e| Error::from(ParseError::UserId(e)))?;
|
||||
servers_to_check.insert(server_name);
|
||||
},
|
||||
| _ => {
|
||||
return Err(JsonError::MissingField { path: "event_id".to_owned() }.into());
|
||||
},
|
||||
},
|
||||
| RoomVersionId::V3
|
||||
| RoomVersionId::V4
|
||||
| RoomVersionId::V5
|
||||
| RoomVersionId::V6
|
||||
| RoomVersionId::V7 => {},
|
||||
// TODO: And for all future versions that have join_authorised_via_users_server
|
||||
| RoomVersionId::V8
|
||||
| RoomVersionId::V9
|
||||
| RoomVersionId::V10
|
||||
| RoomVersionId::V11
|
||||
| RoomVersionId::V12 => {
|
||||
if let Some(authorized_user) = object
|
||||
.get("content")
|
||||
.and_then(|c| c.as_object())
|
||||
.and_then(|c| c.get("join_authorised_via_users_server"))
|
||||
{
|
||||
let authorized_user = authorized_user.as_str().ok_or_else(|| -> JsonError {
|
||||
JsonError::NotOfType {
|
||||
target: "join_authorised_via_users_server".to_owned(),
|
||||
of_type: JsonType::String,
|
||||
}
|
||||
.into()
|
||||
})?;
|
||||
let authorized_user = <&UserId>::try_from(authorized_user)
|
||||
.map_err(|source| VerificationError::ParseIdentifier { identifier_type: "user ID", source })?;
|
||||
|
||||
servers_to_check.insert(authorized_user.server_name().to_owned());
|
||||
}
|
||||
}
|
||||
_ => unimplemented!(),
|
||||
}
|
||||
servers_to_check.insert(authorized_user.server_name().to_owned());
|
||||
}
|
||||
},
|
||||
| _ => unimplemented!(),
|
||||
}
|
||||
|
||||
Ok(servers_to_check)
|
||||
Ok(servers_to_check)
|
||||
}
|
||||
|
||||
/// Extracts the server names and key ids to check signatures for given event.
|
||||
pub fn required_keys(
|
||||
object: &CanonicalJsonObject,
|
||||
version: &RoomVersionId,
|
||||
) -> Result<BTreeMap<OwnedServerName, Vec<OwnedServerSigningKeyId>>, Error> {
|
||||
) -> Result<BTreeMap<OwnedServerName, Vec<OwnedServerSigningKeyId>>, VerificationError> {
|
||||
use CanonicalJsonValue::Object;
|
||||
let mut map = BTreeMap::<OwnedServerName, Vec<OwnedServerSigningKeyId>>::new();
|
||||
let Some(Object(signatures)) = object.get("signatures") else {
|
||||
@@ -132,4 +175,4 @@ pub fn required_keys(
|
||||
}
|
||||
|
||||
Ok(map)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user