From 82d46fb160c5e6f10ea3d73447cfb09d5c6a0492 Mon Sep 17 00:00:00 2001 From: NinekoTheCat Date: Sun, 24 Dec 2023 18:31:37 +0100 Subject: [PATCH] fix: fixed bug where config set ACLs would not be listed --- src/service/acl/mod.rs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/service/acl/mod.rs b/src/service/acl/mod.rs index 738131c7..db32d93e 100644 --- a/src/service/acl/mod.rs +++ b/src/service/acl/mod.rs @@ -17,7 +17,13 @@ pub struct Service { impl Service { pub fn list_acls(&self, filter: Option) -> Vec { - let set = self.db.get_all_acls(); + let mut set = self.db.get_all_acls(); + self.acl_config.allow_list.clone().unwrap_or_default().iter().for_each(|it| { + set.insert(AclDatabaseEntry { mode: AclMode::Allow, hostname: it.to_owned() }); + }); + self.acl_config.block_list.clone().iter().for_each(|it| { + set.insert(AclDatabaseEntry { mode: AclMode::Block, hostname: it.to_owned() }); + }); match filter { Some(filter) => set.into_iter().filter(|it| it.mode == filter).collect(), None => set.into_iter().collect(),