From d4d8c6eb214af24ddfbf12fa4a345051081c6021 Mon Sep 17 00:00:00 2001 From: strawberry Date: Thu, 8 Feb 2024 19:13:01 -0500 Subject: [PATCH] check if custom room ID is apart of forbidden room alias Signed-off-by: strawberry --- src/api/client_server/room.rs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/api/client_server/room.rs b/src/api/client_server/room.rs index dbd86b66..4d7a0c0c 100644 --- a/src/api/client_server/room.rs +++ b/src/api/client_server/room.rs @@ -90,6 +90,18 @@ pub async fn create_room_route( )); } + // apply forbidden room alias checks to custom room IDs too + if services() + .globals + .forbidden_room_names() + .is_match(&custom_room_id_s) + { + return Err(Error::BadRequest( + ErrorKind::Unknown, + "Custom room ID is forbidden.", + )); + } + let full_room_id = "!".to_owned() + &custom_room_id_s.replace('"', "") + ":"