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

Flatten authorised-join check queries.

Browse Source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk
2025-07-27 16:22:34 +00:00
parent 71ef093edc
commit ce25d79e66
1 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/api/client/state.rs
View File

@@ -1,5 +1,5 @@
use axum::extract::State; use axum::extract::State;
use futures::{FutureExt, TryStreamExt}; use futures::{FutureExt, TryFutureExt, TryStreamExt};
use ruma::{ use ruma::{
OwnedEventId, RoomId, UserId, OwnedEventId, RoomId, UserId,
api::client::state::{get_state_events, get_state_events_for_key, send_state_event}, api::client::state::{get_state_events, get_state_events_for_key, send_state_event},
@@ -17,7 +17,7 @@ use ruma::{
}; };
use serde_json::json; use serde_json::json;
use tuwunel_core::{ use tuwunel_core::{
Err, Result, err, Err, Result, err, is_false,
matrix::{Event, pdu::PduBuilder}, matrix::{Event, pdu::PduBuilder},
utils::BoolExt, utils::BoolExt,
}; };
@@ -356,7 +356,7 @@ async fn allowed_to_send_state_event(
}, },
| StateEventType::RoomMember => match json.deserialize_as::<RoomMemberEventContent>() { | StateEventType::RoomMember => match json.deserialize_as::<RoomMemberEventContent>() {
| Ok(membership_content) => { | Ok(membership_content) => {
let Ok(state_key) = UserId::parse(state_key) else { let Ok(_state_key) = UserId::parse(state_key) else {
return Err!(Request(BadJson( return Err!(Request(BadJson(
"Membership event has invalid or non-existent state key" "Membership event has invalid or non-existent state key"
))); )));
@@ -371,17 +371,6 @@ async fn allowed_to_send_state_event(
))); )));
} }
if services
.rooms
.state_cache
.is_joined(state_key, room_id)
.await
{
return Err!(Request(InvalidParam(
"{state_key} is already joined, an authorising user is not required."
)));
}
if !services.globals.user_is_local(&authorising_user) { if !services.globals.user_is_local(&authorising_user) {
return Err!(Request(InvalidParam( return Err!(Request(InvalidParam(
"Authorising user {authorising_user} does not belong to this \ "Authorising user {authorising_user} does not belong to this \
@@ -389,17 +378,19 @@ async fn allowed_to_send_state_event(
))); )));
} }
if !services services
.rooms .rooms
.state_cache .state_cache
.is_joined(&authorising_user, room_id) .is_joined(&authorising_user, room_id)
.await .map(is_false!())
{ .map(BoolExt::into_result)
return Err!(Request(InvalidParam( .map_err(|()| {
"Authorising user {authorising_user} is not in the room, they \ err!(Request(InvalidParam(
cannot authorise the join." "Authorising user {authorising_user} is not in the room. They \
))); cannot authorise the join."
} )))
})
.await?;
} }
}, },
| Err(e) => { | Err(e) => {