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 B06C16B6CC for ; Wed, 4 Aug 2021 10:57:38 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9F7841CDA2 for ; Wed, 4 Aug 2021 10:57:08 +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 23CCC1CD94 for ; Wed, 4 Aug 2021 10:57:08 +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 E8D0E42CEB for ; Wed, 4 Aug 2021 10:57:07 +0200 (CEST) To: pve-devel@lists.proxmox.com, Dominik Csapak References: <20210803122954.2641138-1-d.csapak@proxmox.com> <20210803122954.2641138-3-d.csapak@proxmox.com> From: Fabian Ebner Message-ID: <533be3dd-5b36-7594-d780-4426904a39c3@proxmox.com> Date: Wed, 4 Aug 2021 10:57:07 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: <20210803122954.2641138-3-d.csapak@proxmox.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.501 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 NICE_REPLY_A -0.132 Looks like a legit reply (A) 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: Re: [pve-devel] [PATCH container 2/2] 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 08:57:38 -0000 Am 03.08.21 um 14:29 schrieb Dominik Csapak: > instead of it being root only > > Signed-off-by: Dominik Csapak > --- > src/PVE/LXC.pm | 43 +++++++++++++++++++++++++++++++++++++++++-- > 1 file changed, 41 insertions(+), 2 deletions(-) > > diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm > index 32a2127..abe8ac3 100644 > --- a/src/PVE/LXC.pm > +++ b/src/PVE/LXC.pm > @@ -1270,8 +1270,47 @@ 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)) { > + if ($old_features->{$feature} ne $features->{$feature}) { Produces a warning when only one is not undef: Use of uninitialized value in string ne > + 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; > + } > + } > + $rpcenv->check_vm_perm($authuser, $vmid, $pool, ['VM.Allocate']) > + if $nesting_changed; > + raise_perm_exc("changing feature flags (except nesting) is only allowed for root\@pam") > + if $other_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"); >