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

feat: Fully ignore ACLs that deny everyone

Browse source
This commit is contained in:
timedout 2026-01-15 12:33:51 +00:00
parent 40ac1a49d0
commit 63c2848ac0
No known key found for this signature in database
GPG key ID: 0FA334385D0B689F
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/service/rooms/event_handler/acl_check.rs
View file

@ -25,10 +25,8 @@ pub async fn acl_check(&self, server_name: &ServerName, room_id: &RoomId) -> Res
return Ok(());
}
if acl_event_content.deny.contains(&String::from("*"))
&& acl_event_content.allow.contains(&String::from("*"))
{
warn!(%room_id, "Ignoring broken ACL event (allow key and deny key both contain wildcard \"*\"");
if acl_event_content.deny.contains(&String::from("*")) || acl_event_content.deny.is_empty() {
warn!(%room_id, "Ignoring broken ACL event (everyone is banned)");
return Ok(());
}
@ -36,12 +34,6 @@ pub async fn acl_check(&self, server_name: &ServerName, room_id: &RoomId) -> Res
trace!("server {server_name} is allowed by ACL");
Ok(())
} else {
if acl_event_content.deny.contains(&String::from("*"))
&& server_name == self.services.globals.server_name()
{
warn!(%room_id, "Ignoring broken ACL event that denies everyone");
return Ok(());
}
debug!("Server {server_name} was denied by room ACL in {room_id}");
Err!(Request(Forbidden("Server was denied by room ACL")))
}