Mirrors/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2026-05-26 20:49:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

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
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/service/rooms/event_handler/acl_check.rs
+2 -10
View File
@@ -25,10 +25,8 @@ pub async fn acl_check(&self, server_name: &ServerName, room_id: &RoomId) -> Res
return Ok(()); return Ok(());
} }
if acl_event_content.deny.contains(&String::from("*")) if acl_event_content.deny.contains(&String::from("*")) || acl_event_content.deny.is_empty() {
&& acl_event_content.allow.contains(&String::from("*")) warn!(%room_id, "Ignoring broken ACL event (everyone is banned)");
{
warn!(%room_id, "Ignoring broken ACL event (allow key and deny key both contain wildcard \"*\"");
return Ok(()); 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"); trace!("server {server_name} is allowed by ACL");
Ok(()) Ok(())
} else { } 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}"); debug!("Server {server_name} was denied by room ACL in {room_id}");
Err!(Request(Forbidden("Server was denied by room ACL"))) Err!(Request(Forbidden("Server was denied by room ACL")))
} }