From 3b4a3f94e19eabd185cfc995056aa6c3930eeb1f Mon Sep 17 00:00:00 2001 From: Alen Grizonic Date: Thu, 13 Aug 2015 13:41:33 +0200 Subject: [PATCH] access permissions cleanup fix for removed vms and pools Signed-off-by: Alen Grizonic --- PVE/AccessControl.pm | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/PVE/AccessControl.pm b/PVE/AccessControl.pm index bfee816..54577aa 100644 --- a/PVE/AccessControl.pm +++ b/PVE/AccessControl.pm @@ -478,10 +478,7 @@ sub delete_pool_acl { my $path = "/pool/$pool"; - foreach my $aclpath (keys %{$usercfg->{acl}}) { - delete ($usercfg->{acl}->{$aclpath}) - if $usercfg->{acl}->{$aclpath} eq 'path'; - } + delete ($usercfg->{acl}->{$path}) } # we automatically create some predefined roles by splitting privs @@ -1096,6 +1093,27 @@ sub check_permissions { return 1; } +sub remove_vm_access { + my ($vmid) = @_; + my $delVMaccessFn = sub { + my $usercfg = cfs_read_file("user.cfg"); + + if (my $acl = $usercfg->{acl}->{'/vms/'.$vmid}) { + delete $usercfg->{acl}->{'/vms/'.$vmid}; + cfs_write_file("user.cfg", $usercfg); + } + if (my $pool = $usercfg->{vms}->{$vmid}) { + if (my $data = $usercfg->{pools}->{$pool}) { + delete $data->{vms}->{$vmid}; + delete $usercfg->{vms}->{$vmid}; + cfs_write_file("user.cfg", $usercfg); + } + } + }; + + lock_user_config($delVMaccessFn, "access permissions cleanup for VM $vmid failed"); +} + sub add_vm_to_pool { my ($vmid, $pool) = @_; -- 2.39.2