magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dont allow m.call.invite timeline events in public rooms

Browse source 
also simplifies the encrypted event check (we dont
need to convert anything here)

Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-03-31 00:22:12 -04:00 • committed by June
parent 71cea1c567
commit 7a1a271518
1 changed files with 10 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

59
src/api/client_server/message.rs
View file

@ -8,7 +8,7 @@ use ruma::{
error::ErrorKind, error::ErrorKind,
message::{get_message_events, send_message_event}, message::{get_message_events, send_message_event},
}, },
events::{StateEventType, TimelineEventType}, events::{MessageLikeEventType, StateEventType},
}; };
use serde_json::from_str; use serde_json::from_str;
@ -44,57 +44,18 @@ pub async fn send_message_event_route(
let state_lock = mutex_state.lock().await; let state_lock = mutex_state.lock().await;
// Forbid m.room.encrypted if encryption is disabled // Forbid m.room.encrypted if encryption is disabled
if TimelineEventType::RoomEncrypted == body.event_type.to_string().into() && !services().globals.allow_encryption() if MessageLikeEventType::RoomEncrypted == body.event_type && !services().globals.allow_encryption() {
{
return Err(Error::BadRequest(ErrorKind::Forbidden, "Encryption has been disabled")); return Err(Error::BadRequest(ErrorKind::Forbidden, "Encryption has been disabled"));
} }
// certain event types require certain fields to be valid in request bodies. if body.event_type == MessageLikeEventType::CallInvite
// this helps prevent attempting to handle events that we can't deserialise && services().rooms.directory.is_public_room(&body.room_id)?
// later so don't waste resources on it. {
// return Err(Error::BadRequest(
// see https://spec.matrix.org/v1.9/client-server-api/#events-2 for what's required per event type. ErrorKind::Forbidden,
match body.event_type.to_string().into() { "Room call invites are not allowed in public rooms",
TimelineEventType::RoomMessage => { ));
let body_field = body.body.body.get_field::<String>("body"); }
let msgtype_field = body.body.body.get_field::<String>("msgtype");
if body_field.is_err() {
return Err(Error::BadRequest(
ErrorKind::InvalidParam,
"'body' field in JSON request is invalid",
));
}
if msgtype_field.is_err() {
return Err(Error::BadRequest(
ErrorKind::InvalidParam,
"'msgtype' field in JSON request is invalid",
));
}
},
TimelineEventType::RoomName => {
let name_field = body.body.body.get_field::<String>("name");
if name_field.is_err() {
return Err(Error::BadRequest(
ErrorKind::InvalidParam,
"'name' field in JSON request is invalid",
));
}
},
TimelineEventType::RoomTopic => {
let topic_field = body.body.body.get_field::<String>("topic");
if topic_field.is_err() {
return Err(Error::BadRequest(
ErrorKind::InvalidParam,
"'topic' field in JSON request is invalid",
));
}
},
_ => {}, // event may be custom/experimental or can be empty don't do anything with it
};
// Check if this is a new transaction id // Check if this is a new transaction id
if let Some(response) = services() if let Some(response) = services()