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

check if invited user is an admin before rejecting instead

Browse source 
i think this makes more sense tbh than what synapse does

Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-03-02 21:54:16 -05:00 • committed by June
parent 34e8fd38cf
commit 608aa83ed2
4 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
conduwuit-example.toml
View file

@ -153,7 +153,7 @@ registration_token = "change this token for something specific to your server"
# allow_room_creation = true # allow_room_creation = true
# controls whether non-admin local users are forbidden from sending room invites (local and remote), # controls whether non-admin local users are forbidden from sending room invites (local and remote),
# AND rejects all incoming remote/federation room invites for all users (including admins). # and if non-admin users can receive remote room invites. admins are always allowed to send and receive all room invites.
# defaults to false # defaults to false
# block_non_admin_invites = falsse # block_non_admin_invites = falsse

4
src/api/client_server/membership.rs
View file

@ -201,7 +201,9 @@ pub async fn invite_user_route(
)); ));
} }
if services().rooms.metadata.is_banned(&body.room_id)? && !services().users.is_admin(sender_user)? { if services().rooms.metadata.is_banned(&body.room_id)?
&& !services().users.is_admin(sender_user)?
{
info!( info!(
"Local user {} who is not an admin attempted to send an invite for banned room {}.", "Local user {} who is not an admin attempted to send an invite for banned room {}.",
&sender_user, &body.room_id &sender_user, &body.room_id

20
src/api/server_server.rs
View file

@ -1845,14 +1845,6 @@ pub async fn create_invite_route(
.as_ref() .as_ref()
.expect("server is authenticated"); .expect("server is authenticated");
if services().globals.block_non_admin_invites() {
info!("Received remote invite from server {} for room {}, but \"block_non_admin_invites\" is enabled, rejecting.", &sender_servername, &body.room_id);
return Err(Error::BadRequest(
ErrorKind::Forbidden,
"This server does not allow room invites.",
));
}
services() services()
.rooms .rooms
.event_handler .event_handler
@ -1922,7 +1914,9 @@ pub async fn create_invite_route(
) )
.map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "state_key is not a user id."))?; .map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "state_key is not a user id."))?;
if services().rooms.metadata.is_banned(&body.room_id)? && !services().users.is_admin(&invited_user)? { if services().rooms.metadata.is_banned(&body.room_id)?
&& !services().users.is_admin(&invited_user)?
{
info!( info!(
"Received remote invite from server {} for room {} and for user {invited_user}, but room is banned by us.", "Received remote invite from server {} for room {} and for user {invited_user}, but room is banned by us.",
&sender_servername, &body.room_id &sender_servername, &body.room_id
@ -1933,6 +1927,14 @@ pub async fn create_invite_route(
)); ));
} }
if services().globals.block_non_admin_invites() && !services().users.is_admin(&invited_user)? {
info!("Received remote invite from server {} for room {} and for user {invited_user} who is not an admin, but \"block_non_admin_invites\" is enabled, rejecting.", &sender_servername, &body.room_id);
return Err(Error::BadRequest(
ErrorKind::Forbidden,
"This server does not allow room invites.",
));
}
let mut invite_state = body.invite_room_state.clone(); let mut invite_state = body.invite_room_state.clone();
let mut event: JsonObject = serde_json::from_str(body.event.get()) let mut event: JsonObject = serde_json::from_str(body.event.get())

2
src/config/mod.rs
View file

@ -281,7 +281,7 @@ impl fmt::Display for Config {
&self.allow_local_presence.to_string(), &self.allow_local_presence.to_string(),
), ),
( (
"Block non-admin room invites (local and remote) and block all incoming remote invites", "Block non-admin room invites (local and remote, admins can still send and receive invites)",
&self.block_non_admin_invites.to_string(), &self.block_non_admin_invites.to_string(),
), ),
( (