correctly compute GUI capabilities (consider pools)

[pve-access-control.git] / PVE / API2 / AccessControl.pm

diff --git a/PVE/API2/AccessControl.pm b/PVE/API2/AccessControl.pm
index 141bc44831a61c5f55a3a3e6f3ff6c0965d78cb1..1679ed45eb4c0d6ff81682eb967fbce3c5521cfd 100644 (file)
--- a/PVE/API2/AccessControl.pm
+++ b/PVE/API2/AccessControl.pm
@@ -151,12 +151,22 @@ my $compute_api_permission = sub {
        dc => {},
     };
 
        dc => {},
     };
 

-    foreach my $vmid (keys %$idlist, '__phantom__') {
-       my $perm = $rpcenv->permissions($authuser, "/vms/$vmid");
+    my $extract_vm_caps = sub {
+       my ($path) = @_;
+       
+       my $perm = $rpcenv->permissions($authuser, $path);

        foreach my $priv (keys %$perm) {
        foreach my $priv (keys %$perm) {

-           next if !($priv eq 'Permissions.Modify' ||$priv =~ m/^VM\./);
+           next if !($priv eq 'Permissions.Modify' || $priv =~ m/^VM\./);

            $res->{vms}->{$priv} = 1;   
        }
            $res->{vms}->{$priv} = 1;   
        }

+    };
+
+    foreach my $pool (keys %{$usercfg->{pools}}) {
+       &$extract_vm_caps("/pool/$pool");
+    }
+
+    foreach my $vmid (keys %$idlist, '__phantom__') {
+       &$extract_vm_caps("/vms/$vmid");

     }
 
     foreach my $storeid (@sids, '__phantom__') {
     }
 
     foreach my $storeid (@sids, '__phantom__') {