From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id E58F46B79E for ; Wed, 4 Aug 2021 12:51:14 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E23431E324 for ; Wed, 4 Aug 2021 12:51:14 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 035E51E2F0 for ; Wed, 4 Aug 2021 12:51:13 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id B86EF42DA4 for ; Wed, 4 Aug 2021 12:51:12 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Wed, 4 Aug 2021 12:51:08 +0200 Message-Id: <20210804105111.183355-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210804105111.183355-1-d.csapak@proxmox.com> References: <20210804105111.183355-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.475 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [lxc.pm] Subject: [pve-devel] [PATCH container v2 2/3] allow nesting to be changed for VM.Allocate on unprivileged containers X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Aug 2021 10:51:14 -0000 instead of it being root only Signed-off-by: Dominik Csapak --- src/PVE/LXC.pm | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm index 32a2127..dbdec23 100644 --- a/src/PVE/LXC.pm +++ b/src/PVE/LXC.pm @@ -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"); -- 2.30.2