From 4197c0e26eb48a6a6688a44562c2a339f344a042 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 19 Jun 2024 14:42:26 +0200 Subject: [PATCH] access-control: minor code cleanup Signed-off-by: Wolfgang Bumiller --- proxmox-access-control/src/acl.rs | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/proxmox-access-control/src/acl.rs b/proxmox-access-control/src/acl.rs index 5ff47e45..b6b7b400 100644 --- a/proxmox-access-control/src/acl.rs +++ b/proxmox-access-control/src/acl.rs @@ -84,10 +84,7 @@ impl AclTreeNode { for (role, propagate) in roles { if *propagate || leaf { - if access_conf() - .role_no_access() - .map_or_else(|| false, |r| r == role) - { + if access_conf().role_no_access() == Some(role) { // return a map with a single role 'NoAccess' let mut map = HashMap::new(); map.insert(role.to_string(), false); @@ -103,8 +100,7 @@ impl AclTreeNode { fn extract_group_roles(&self, _user: &Userid, leaf: bool) -> HashMap { let mut map = HashMap::new(); - #[allow(clippy::for_kv_map)] - for (_group, roles) in &self.groups { + for roles in self.groups.values() { let is_member = false; // fixme: check if user is member of the group if !is_member { continue; @@ -112,10 +108,7 @@ impl AclTreeNode { for (role, propagate) in roles { if *propagate || leaf { - if access_conf() - .role_no_access() - .map_or_else(|| false, |r| r == role) - { + if access_conf().role_no_access() == Some(role) { // return a map with a single role 'NoAccess' let mut map = HashMap::new(); map.insert(role.to_string(), false);