TudbuT/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'error-create-remote-user' into 'next'

Browse source 
fix(admin): don't allow creation of remote users

See merge request famedly/conduit!663
This commit is contained in:
Matthias Ahouansou 2024-05-02 10:39:46 +00:00
commit 38200163d6
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -432,7 +432,6 @@ dependencies = [
"tracing-flame", "tracing-flame",
"tracing-opentelemetry", "tracing-opentelemetry",
"tracing-subscriber", "tracing-subscriber",
"trust-dns-resolver",
"url", "url",
] ]

8
src/service/admin/mod.rs
View file

@ -605,6 +605,14 @@ impl Service {
))) )))
} }
}; };
// Checks if user is local
if user_id.server_name() != services().globals.server_name() {
return Ok(RoomMessageEventContent::text_plain(
"The specified user is not from this server!",
));
};
if user_id.is_historical() { if user_id.is_historical() {
return Ok(RoomMessageEventContent::text_plain(format!( return Ok(RoomMessageEventContent::text_plain(format!(
"Userid {user_id} is not allowed due to historical" "Userid {user_id} is not allowed due to historical"