]> git.proxmox.com Git - pve-container.git/commitdiff
allow nesting to be changed for VM.Allocate on unprivileged containers
authorDominik Csapak <d.csapak@proxmox.com>
Wed, 4 Aug 2021 10:51:08 +0000 (12:51 +0200)
committerWolfgang Bumiller <w.bumiller@proxmox.com>
Wed, 4 Aug 2021 11:14:44 +0000 (13:14 +0200)
instead of it being root only

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
src/PVE/LXC.pm

index 32a2127e5bd9637f5129c1d711808429f6ecb330..dbdec2389b3d1ffd86e634e2c7b9eadef2d74139 100644 (file)
@@ -1270,8 +1270,49 @@ sub check_ct_modify_config_perm {
                 $opt eq 'searchdomain' || $opt eq 'hostname') {
            $rpcenv->check_vm_perm($authuser, $vmid, $pool, ['VM.Config.Network']);
        } elsif ($opt eq 'features') {
-           # For now this is restricted to root@pam
-           raise_perm_exc("changing feature flags is only allowed for root\@pam");
+           raise_perm_exc("changing feature flags for privileged container is only allowed for root\@pam")
+               if !$unprivileged;
+
+           my $nesting_changed = 0;
+           my $other_changed = 0;
+           if (!$delete) {
+               my $features = PVE::LXC::Config->parse_features($newconf->{$opt});
+               if (defined($oldconf) && $oldconf->{$opt}) {
+                   # existing container with features
+                   my $old_features = PVE::LXC::Config->parse_features($oldconf->{$opt});
+                   for my $feature ((keys %$old_features, keys %$features)) {
+                       my $old = $old_features->{$feature} // '';
+                       my $new = $features->{$feature} // '';
+                       if ($old ne $new) {
+                           if ($feature eq 'nesting') {
+                               $nesting_changed = 1;
+                               next;
+                           } else {
+                               $other_changed = 1;
+                               last;
+                           }
+                       }
+                   }
+               } else {
+                   # new container or no features defined
+                   if (scalar(keys %$features) == 1 && $features->{nesting}) {
+                       $nesting_changed = 1;
+                   } elsif (scalar(keys %$features) > 0) {
+                       $other_changed = 1;
+                   }
+               }
+           } else {
+               my $features = PVE::LXC::Config->parse_features($oldconf->{$opt});
+               if (scalar(keys %$features) == 1 && $features->{nesting}) {
+                   $nesting_changed = 1;
+               } elsif (scalar(keys %$features) > 0) {
+                   $other_changed = 1;
+               }
+           }
+           raise_perm_exc("changing feature flags (except nesting) is only allowed for root\@pam")
+               if $other_changed;
+           $rpcenv->check_vm_perm($authuser, $vmid, $pool, ['VM.Allocate'])
+               if $nesting_changed;
        } elsif ($opt eq 'hookscript') {
            # For now this is restricted to root@pam
            raise_perm_exc("changing the hookscript is only allowed for root\@pam");