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 2571A703A6 for ; Tue, 21 Jun 2022 11:20:50 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7E6752AE1 for ; Tue, 21 Jun 2022 11:20:19 +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 9686F2994 for ; Tue, 21 Jun 2022 11:20:14 +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 66C4143C5D for ; Tue, 21 Jun 2022 11:20:14 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Tue, 21 Jun 2022 11:19:58 +0200 Message-Id: <20220621092012.1776825-11-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220621092012.1776825-1-d.csapak@proxmox.com> References: <20220621092012.1776825-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.101 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 T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [config.pm, lxc.pm] Subject: [pve-devel] [PATCH container v7 1/1] check_ct_modify_config_perm: check 'admin' tags privileges 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, 21 Jun 2022 09:20:50 -0000 normal tags require 'VM.Config.Options' on the CT, admin tags require 'Sys.Modify' on '/' a user can set/delete/reorder tags, as long as no admin tags get added/removed Signed-off-by: Dominik Csapak --- src/PVE/LXC.pm | 31 +++++++++++++++++++++++++++++++ src/PVE/LXC/Config.pm | 3 ++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm index fe63087..ce2f8ff 100644 --- a/src/PVE/LXC.pm +++ b/src/PVE/LXC.pm @@ -1333,6 +1333,37 @@ 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 $old_tags = {}; + my $new_tags = {}; + my $check_admin = 0; + my $check_user = 0; + + 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}; + if (PVE::JSONSchema::is_admin_pve_tag($tag)) { + $check_admin = 1; + } else { + $check_user = 1; + } + } + }; + + $check_tags->($old_tags, $new_tags); + $check_tags->($new_tags, $old_tags); + + if ($check_admin) { + $rpcenv->check($authuser, "/", ['Sys.Modify']); + } + + if ($check_user) { + $rpcenv->check_vm_perm($authuser, $vmid, $pool, ['VM.Config.Options']); + } } else { $rpcenv->check_vm_perm($authuser, $vmid, $pool, ['VM.Config.Options']); } diff --git a/src/PVE/LXC/Config.pm b/src/PVE/LXC/Config.pm index b4b0261..2362d74 100644 --- a/src/PVE/LXC/Config.pm +++ b/src/PVE/LXC/Config.pm @@ -597,7 +597,8 @@ my $confdesc = { }, tags => { type => 'string', format => 'pve-tag-list', - description => 'Tags of the Container. This is only meta information.', + description => 'Tags of the Container. This is only meta information. Prefixing a tag with'. + "'+' marks it as an admin tag and can only be set with 'Sys.Modify' on '/'.", optional => 1, }, debug => { -- 2.30.2