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

fix: fixed bug where config set ACLs would not be listed

Browse source
This commit is contained in:
NinekoTheCat 2023-12-24 18:31:37 +01:00
parent 90232b894d
commit 82d46fb160
No known key found for this signature in database
GPG key ID: 700DB3F678A4AB66
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,7 +17,13 @@ pub struct Service {
impl Service { impl Service {
pub fn list_acls(&self, filter: Option<AclMode>) -> Vec<AclDatabaseEntry> { pub fn list_acls(&self, filter: Option<AclMode>) -> Vec<AclDatabaseEntry> {
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 { match filter {
Some(filter) => set.into_iter().filter(|it| it.mode == filter).collect(), Some(filter) => set.into_iter().filter(|it| it.mode == filter).collect(),
None => set.into_iter().collect(), None => set.into_iter().collect(),