git-mirrors/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2025-07-09 13:26:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: made it so remove acl command will say if a non-existing entry is attempted to be removed

Browse source
This commit is contained in:
NinekoTheCat 2023-12-25 00:59:17 +01:00
parent d325537308
commit 580b6af894
No known key found for this signature in database
GPG key ID: 700DB3F678A4AB66
4 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/database/key_value/acl.rs
View file

@ -39,8 +39,12 @@ impl Data for KeyValueDatabase {
) )
} }
fn remove_acl(&self, host: Host<String>) -> crate::Result<()> { fn remove_acl(&self, host: Host<String>) -> crate::Result<Option<()>> {
self.acl_list.remove(host.to_string().as_bytes()) if self.acl_list.get(host.to_string().as_bytes())?.is_none() {
return Ok(None);
}
self.acl_list.remove(host.to_string().as_bytes())?;
Ok(Some(()))
} }
fn get_all_acls(&self) -> HashSet<AclDatabaseEntry> { fn get_all_acls(&self) -> HashSet<AclDatabaseEntry> {

2
src/service/acl/data.rs
View file

@ -10,7 +10,7 @@ pub trait Data: Send + Sync {
/// add a given Acl entry to the database /// add a given Acl entry to the database
fn add_acl(&self, acl: AclDatabaseEntry) -> crate::Result<()>; fn add_acl(&self, acl: AclDatabaseEntry) -> crate::Result<()>;
/// remove a given Acl entry from the database /// remove a given Acl entry from the database
fn remove_acl(&self, host: Host<String>) -> crate::Result<()>; fn remove_acl(&self, host: Host<String>) -> crate::Result<Option<()>>;
/// list all acls /// list all acls
fn get_all_acls(&self) -> HashSet<AclDatabaseEntry>; fn get_all_acls(&self) -> HashSet<AclDatabaseEntry>;

2
src/service/acl/mod.rs
View file

@ -38,7 +38,7 @@ impl Service {
None => set.into_iter().collect(), None => set.into_iter().collect(),
} }
} }
pub fn remove_acl(&self, host: Host) -> crate::Result<()> { pub fn remove_acl(&self, host: Host) -> crate::Result<Option<()>> {
self.db.remove_acl(host) self.db.remove_acl(host)
} }

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

@ -1300,14 +1300,18 @@ impl Service {
} }
}; };
if let Err(error) = services().acl.remove_acl(host.clone()) { match services().acl.remove_acl(host.clone()) {
Err(error) => {
error!( error!(
"encountered {} while trying to remove acl with host {}", "encountered {} while trying to remove acl with host {}",
error, host error, host
); );
RoomMessageEventContent::text_plain("error, couldn't remove acl") RoomMessageEventContent::text_plain("error, couldn't remove acl")
} else { }
RoomMessageEventContent::text_plain("successfully removed ACL") Ok(Some(_)) => RoomMessageEventContent::text_plain("successfully removed ACL"),
Ok(None) => RoomMessageEventContent::text_plain(
"couldn't remove acl as it doesn't exist",
),
} }
} }
AdminCommand::Acl(AclCommand::List { filter }) => { AdminCommand::Acl(AclCommand::List { filter }) => {