Mirrors/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2026-05-26 20:49:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Don't check restricted join rules for invite joins

Browse Source
This commit is contained in:
nexy7574
2025-10-27 14:34:50 +00:00
committed by Tom Foster
parent 7c74db5e74
commit a581e8de01
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/server/make_join.rs
+15 -4
View File
@@ -1,6 +1,6 @@
use axum::extract::State; use axum::extract::State;
use conduwuit::{ use conduwuit::{
Err, Error, Result, debug_info, matrix::pdu::PduBuilder, utils::IterStream, warn, Err, Error, Result, debug_info, info, matrix::pdu::PduBuilder, utils::IterStream, warn,
}; };
use conduwuit_service::Services; use conduwuit_service::Services;
use futures::StreamExt; use futures::StreamExt;
@@ -22,6 +22,7 @@ use crate::Ruma;
/// # `GET /_matrix/federation/v1/make_join/{roomId}/{userId}` /// # `GET /_matrix/federation/v1/make_join/{roomId}/{userId}`
/// ///
/// Creates a join template. /// Creates a join template.
#[tracing::instrument(skip_all, fields(room_id = %body.room_id, user_id = %body.user_id, origin = %body.origin()))]
pub(crate) async fn create_join_event_template_route( pub(crate) async fn create_join_event_template_route(
State(services): State<crate::State>, State(services): State<crate::State>,
body: Ruma<prepare_join_event::v1::Request>, body: Ruma<prepare_join_event::v1::Request>,
@@ -72,11 +73,16 @@ pub(crate) async fn create_join_event_template_route(
} }
let state_lock = services.rooms.state.mutex.lock(&body.room_id).await; let state_lock = services.rooms.state.mutex.lock(&body.room_id).await;
let is_invited = services
.rooms
.state_cache
.is_invited(&body.user_id, &body.room_id)
.await;
let join_authorized_via_users_server: Option<OwnedUserId> = { let join_authorized_via_users_server: Option<OwnedUserId> = {
use RoomVersionId::*; use RoomVersionId::*;
if matches!(room_version_id, V1 | V2 | V3 | V4 | V5 | V6 | V7) { if matches!(room_version_id, V1 | V2 | V3 | V4 | V5 | V6 | V7) || is_invited {
// room version does not support restricted join rules // room version does not support restricted join rules, or the user is currently
// already invited
None None
} else if user_can_perform_restricted_join( } else if user_can_perform_restricted_join(
&services, &services,
@@ -103,6 +109,10 @@ pub(crate) async fn create_join_event_template_route(
.await .await
.map(ToOwned::to_owned) .map(ToOwned::to_owned)
else { else {
info!(
"No local user is able to authorize the join of {} into {}",
&body.user_id, &body.room_id
);
return Err!(Request(UnableToGrantJoin( return Err!(Request(UnableToGrantJoin(
"No user on this server is able to assist in joining." "No user on this server is able to assist in joining."
))); )));
@@ -167,6 +177,7 @@ pub(crate) async fn user_can_perform_restricted_join(
) )
.await .await
else { else {
// No join rules means there's nothing to authorise (defaults to invite)
return Ok(false); return Ok(false);
}; };