mirrors/conduwuit
1
0
Fork 0
mirror of https://github.com/girlbossceo/conduwuit.git synced 2026-02-09 12:34:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

implement rooms and not_rooms filters on /message

Browse source 
I really doubt anybody is sending /message requests with a filter that
rejects the entire request, but it's the first step in the filter
implementation.
This commit is contained in:
Benjamin Lee 2024-05-02 18:23:19 -07:00
parent cc77d47adc
commit 296b777c04
No known key found for this signature in database
GPG key ID: FB9624E2885D55A4
3 changed files with 101 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,7 +16,9 @@ use serde_json::{from_str, Value};
use crate::{
service::{pdu::PduBuilder, rooms::timeline::PduCount},
services, utils, Error, PduEvent, Result, Ruma,
services, utils,
utils::filter::CompiledRoomEventFilter,
Error, PduEvent, Result, Ruma,
};
/// # `PUT /_matrix/client/v3/rooms/{roomId}/send/{eventType}/{txnId}`
@ -125,6 +127,10 @@ pub(crate) async fn get_message_events_route(
let sender_user = body.sender_user.as_ref().expect("user is authenticated");
let sender_device = body.sender_device.as_ref().expect("user is authenticated");
let Ok(filter) = CompiledRoomEventFilter::try_from(&body.filter) else {
return Err(Error::BadRequest(ErrorKind::InvalidParam, "invalid 'filter' parameter"));
};
let from = match body.from.clone() {
Some(from) => PduCount::try_from_string(&from)?,
None => match body.dir {
@ -133,6 +139,15 @@ pub(crate) async fn get_message_events_route(
},
};
if !filter.room_allowed(&body.room_id) {
return Ok(get_message_events::v3::Response {
start: from.stringify(),
end: None,
chunk: vec![],
state: vec![],
});
}
let to = body
.to
.as_ref()