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

don't grant guest users admin, slight user + guest logging improvements

Browse source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2023-12-21 20:46:24 -05:00 • committed by June
parent b0fdc1351b
commit dc73df763a
1 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/api/client_server/account.rs
View file

@ -78,6 +78,7 @@ pub async fn register_route(body: Ruma<register::v3::Request>) -> Result<registe
&& !body.from_appservice && !body.from_appservice
&& services().globals.config.registration_token.is_none() && services().globals.config.registration_token.is_none()
{ {
info!("Registration disabled, no reg token configured, rejecting registration attempt for username {:?}", body.username);
return Err(Error::BadRequest( return Err(Error::BadRequest(
ErrorKind::Forbidden, ErrorKind::Forbidden,
"Registration has been disabled.", "Registration has been disabled.",
@ -239,18 +240,30 @@ pub async fn register_route(body: Ruma<register::v3::Request>) -> Result<registe
body.initial_device_display_name.clone(), body.initial_device_display_name.clone(),
)?; )?;
info!("New user {} registered on this server.", user_id); info!("New user \"{}\" registered on this server.", user_id);
// log in conduit admin channel if a non-guest user registered
if !body.from_appservice && !is_guest { if !body.from_appservice && !is_guest {
services() services()
.admin .admin
.send_message(RoomMessageEventContent::notice_plain(format!( .send_message(RoomMessageEventContent::notice_plain(format!(
"New user {user_id} registered on this server." "New user \"{user_id}\" registered on this server."
))); )));
} }
// If this is the first real user, grant them admin privileges // log in conduit admin channel if a guest registered
if !body.from_appservice && is_guest {
services()
.admin
.send_message(RoomMessageEventContent::notice_plain(format!(
"Guest user \"{user_id}\" with device display name `{:?}` registered on this server.",
body.initial_device_display_name
)));
}
// If this is the first real user, grant them admin privileges except for guest users
// Note: the server user, @conduit:servername, is generated first // Note: the server user, @conduit:servername, is generated first
if services().users.count()? == 2 { if services().users.count()? == 2 && !is_guest {
services() services()
.admin .admin
.make_user_admin(&user_id, displayname) .make_user_admin(&user_id, displayname)