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

reduce line width on banned_room_check

Browse source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-12-07 00:53:15 -05:00
parent c070edc189
commit a1b0369033
1 changed files with 74 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

146
src/api/client/membership.rs
View file

@ -56,87 +56,89 @@ use crate::{client::full_user_deactivate, Ruma};
async fn banned_room_check( async fn banned_room_check(
services: &Services, user_id: &UserId, room_id: Option<&RoomId>, server_name: Option<&ServerName>, services: &Services, user_id: &UserId, room_id: Option<&RoomId>, server_name: Option<&ServerName>,
client_ip: IpAddr, client_ip: IpAddr,
) -> Result<()> { ) -> Result {
if !services.users.is_admin(user_id).await { if services.users.is_admin(user_id).await {
if let Some(room_id) = room_id { return Ok(());
if services.rooms.metadata.is_banned(room_id).await }
|| services
.globals
.config
.forbidden_remote_server_names
.contains(&room_id.server_name().unwrap().to_owned())
{
warn!(
"User {user_id} who is not an admin attempted to send an invite for or attempted to join a banned \
room or banned room server name: {room_id}"
);
if services.globals.config.auto_deactivate_banned_room_attempts { if let Some(room_id) = room_id {
warn!("Automatically deactivating user {user_id} due to attempted banned room join"); if services.rooms.metadata.is_banned(room_id).await
|| services
if services.globals.config.admin_room_notices {
services
.admin
.send_message(RoomMessageEventContent::text_plain(format!(
"Automatically deactivating user {user_id} due to attempted banned room join from IP \
{client_ip}"
)))
.await
.ok();
}
let all_joined_rooms: Vec<OwnedRoomId> = services
.rooms
.state_cache
.rooms_joined(user_id)
.map(Into::into)
.collect()
.await;
full_user_deactivate(services, user_id, &all_joined_rooms).await?;
}
return Err!(Request(Forbidden("This room is banned on this homeserver.")));
}
} else if let Some(server_name) = server_name {
if services
.globals .globals
.config .config
.forbidden_remote_server_names .forbidden_remote_server_names
.contains(&server_name.to_owned()) .contains(&room_id.server_name().unwrap().to_owned())
{ {
warn!( warn!(
"User {user_id} who is not an admin tried joining a room which has the server name {server_name} \ "User {user_id} who is not an admin attempted to send an invite for or attempted to join a banned \
that is globally forbidden. Rejecting.", room or banned room server name: {room_id}"
); );
if services.globals.config.auto_deactivate_banned_room_attempts { if services.globals.config.auto_deactivate_banned_room_attempts {
warn!("Automatically deactivating user {user_id} due to attempted banned room join"); warn!("Automatically deactivating user {user_id} due to attempted banned room join");
if services.globals.config.admin_room_notices { if services.globals.config.admin_room_notices {
services services
.admin .admin
.send_message(RoomMessageEventContent::text_plain(format!( .send_message(RoomMessageEventContent::text_plain(format!(
"Automatically deactivating user {user_id} due to attempted banned room join from IP \ "Automatically deactivating user {user_id} due to attempted banned room join from IP \
{client_ip}" {client_ip}"
))) )))
.await .await
.ok(); .ok();
}
let all_joined_rooms: Vec<OwnedRoomId> = services
.rooms
.state_cache
.rooms_joined(user_id)
.map(Into::into)
.collect()
.await;
full_user_deactivate(services, user_id, &all_joined_rooms).await?;
} }
return Err!(Request(Forbidden("This remote server is banned on this homeserver."))); let all_joined_rooms: Vec<OwnedRoomId> = services
.rooms
.state_cache
.rooms_joined(user_id)
.map(Into::into)
.collect()
.await;
full_user_deactivate(services, user_id, &all_joined_rooms).await?;
} }
return Err!(Request(Forbidden("This room is banned on this homeserver.")));
}
} else if let Some(server_name) = server_name {
if services
.globals
.config
.forbidden_remote_server_names
.contains(&server_name.to_owned())
{
warn!(
"User {user_id} who is not an admin tried joining a room which has the server name {server_name} that \
is globally forbidden. Rejecting.",
);
if services.globals.config.auto_deactivate_banned_room_attempts {
warn!("Automatically deactivating user {user_id} due to attempted banned room join");
if services.globals.config.admin_room_notices {
services
.admin
.send_message(RoomMessageEventContent::text_plain(format!(
"Automatically deactivating user {user_id} due to attempted banned room join from IP \
{client_ip}"
)))
.await
.ok();
}
let all_joined_rooms: Vec<OwnedRoomId> = services
.rooms
.state_cache
.rooms_joined(user_id)
.map(Into::into)
.collect()
.await;
full_user_deactivate(services, user_id, &all_joined_rooms).await?;
}
return Err!(Request(Forbidden("This remote server is banned on this homeserver.")));
} }
} }