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 6DDDA89DC7 for ; Tue, 18 Oct 2022 16:03:00 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3EF2129613 for ; Tue, 18 Oct 2022 16:02:30 +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 for ; Tue, 18 Oct 2022 16:02:28 +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 4304B44A7D for ; Tue, 18 Oct 2022 16:02:28 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Tue, 18 Oct 2022 16:02:12 +0200 Message-Id: <20221018140226.598710-7-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221018140226.598710-1-d.csapak@proxmox.com> References: <20221018140226.598710-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.068 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 v8] 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: Tue, 18 Oct 2022 14:03:00 -0000 'normal' tags require 'VM.Config.Options' on '/vm/', but not allowed tags (either limited with 'user-tag-privileges' or 'admin-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 --- src/PVE/LXC.pm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm index fe63087..c31c95c 100644 --- a/src/PVE/LXC.pm +++ b/src/PVE/LXC.pm @@ -1333,6 +1333,45 @@ 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') { + my $user_tags; + my $admin_tags; + + my $check_tag_perms = sub { + my ($tag) = @_; + if ($rpcenv->check($authuser, '/', ['Sys.Modify'], 1)) { + return; + } + + $rpcenv->check_vm_perm($authuser, $vmid, undef, ['VM.Config.Options']); + + if (!defined($user_tags) && !defined($admin_tags)) { + ($user_tags, $admin_tags) = PVE::DataCenterConfig::get_user_admin_tags(); + } + + if ((defined($user_tags) && !$user_tags->{$tag}) || + (defined($admin_tags) && $admin_tags->{$tag}) + ) { + $rpcenv->check($authuser, '/', ['Sys.Modify']); + } + }; + + 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}); + + 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