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 1E08F9193B for ; Mon, 14 Nov 2022 14:37:38 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F0DD523F5D for ; Mon, 14 Nov 2022 14:37:37 +0100 (CET) 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 for ; Mon, 14 Nov 2022 14:37:37 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 11A2743A16 for ; Mon, 14 Nov 2022 14:37:37 +0100 (CET) Date: Mon, 14 Nov 2022 14:37:35 +0100 From: Wolfgang Bumiller To: Dominik Csapak Cc: pve-devel@lists.proxmox.com Message-ID: <20221114133735.jzczsrjr3stgkj75@wobu-vie.proxmox.com> References: <20221114094404.1241050-1-d.csapak@proxmox.com> <20221114094404.1241050-7-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20221114094404.1241050-7-d.csapak@proxmox.com> X-SPAM-LEVEL: Spam detection results: =?UTF-8?Q?0=0A=09?=AWL 0.236 Adjusted score from AWL reputation of From: =?UTF-8?Q?address=0A=09?=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 =?UTF-8?Q?Alignment=0A=09?=SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF =?UTF-8?Q?Record=0A=09?=SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pve-devel] [PATCH container v9 1/1] check_ct_modify_config_perm: improve tag privilege check 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: Mon, 14 Nov 2022 13:37:38 -0000 nits & dedup question On Mon, Nov 14, 2022 at 10:43:50AM +0100, Dominik Csapak wrote: > 'normal' tags require 'VM.Config.Options' on '/vm/', but not > allowed tags (either limited with 'user-tag-access' or 'privileged-tags' > in the datacenter config) require 'Sys.Modify' on '/' > > this patch implements the proper checks on adding/editing/deleting > these permissions > > Signed-off-by: Dominik Csapak > --- > changes from v8: > * adapt to 'get_allowed_tags' > * cache privilege checks (so we don't have to do it when many tags change) > src/PVE/LXC.pm | 42 ++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 42 insertions(+) > > diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm > index 4bbd739..44dee7e 100644 > --- a/src/PVE/LXC.pm > +++ b/src/PVE/LXC.pm > @@ -1336,6 +1336,48 @@ sub check_ct_modify_config_perm { > } elsif ($opt eq 'hookscript') { > # For now this is restricted to root@pam > raise_perm_exc("changing the hookscript is only allowed for root\@pam"); > + } elsif ($opt eq 'tags') { Could we put this entire block into guest-common somehow? > + my $allowed_tags; > + my $privileged_tags; > + my $freeform; > + my $privileged_user = $rpcenv->check($authuser, '/', ['Sys.Modify'], 1); > + my $has_config_options = > + $rpcenv->check_vm_perm($authuser, $vmid, undef, ['VM.Config.Options'], 1); > + > + my $check_tag_perms = sub { ^ or at leas this? As this code is duplicated in qemu-server > + my ($tag) = @_; > + > + return if $privileged_user; > + > + $rpcenv->check_vm_perm($authuser, $vmid, undef, ['VM.Config.Options']) > + if !$has_config_options; > + > + if (!defined($allowed_tags) && !defined($privileged_tags) && !defined($freeform)) { > + ($allowed_tags, $privileged_tags, $freeform) > + = PVE::DataCenterConfig::get_allowed_tags($rpcenv, $authuser); > + } > + > + if ((!$allowed_tags->{$tag} && !$freeform) || $privileged_tags->{$tag}) { > + die "'Sys.Modify' required on '/' for modifying tag $tag\n" if !$privileged_user; > + } > + }; > + > + my $old_tags = {}; > + my $new_tags = {}; > + > + map { $old_tags->{$_} += 1 } PVE::Tools::split_list($oldconf->{$opt} // ''); > + map { $new_tags->{$_} += 1 } PVE::Tools::split_list($newconf->{$opt}); ^ map -> for > + > + my $check_tags = sub { > + my ($a, $b) = @_; > + foreach my $tag (keys %$a) { > + next if ($b->{$tag} // 0) == ($a->{$tag} // 0); > + $check_tag_perms->($tag); > + } > + }; > + > + $check_tags->($old_tags, $new_tags); > + $check_tags->($new_tags, $old_tags); > } else { > $rpcenv->check_vm_perm($authuser, $vmid, $pool, ['VM.Config.Options']); > } > -- > 2.30.2