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 343F470353 for ; Tue, 21 Jun 2022 11:20:52 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C85EA2BE8 for ; Tue, 21 Jun 2022 11:20:21 +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 856F02993 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 5A9E043C57 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:57 +0200 Message-Id: <20220621092012.1776825-10-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. [qemuserver.pm, qemu.pm] Subject: [pve-devel] [PATCH qemu-server v7 1/1] api: update: 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:52 -0000 normal tags require 'VM.Config.Options' on the VM, 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 --- PVE/API2/Qemu.pm | 56 ++++++++++++++++++++++++++++++++++++++++++++++- PVE/QemuServer.pm | 3 ++- 2 files changed, 57 insertions(+), 2 deletions(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index 99b426e..37b56c8 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -519,7 +519,6 @@ my $generaloptions = { 'startup' => 1, 'tdf' => 1, 'template' => 1, - 'tags' => 1, }; my $vmpoweroptions = { @@ -589,6 +588,7 @@ my $check_vm_modify_config_perm = sub { next if PVE::QemuServer::is_valid_drivename($opt); next if $opt eq 'cdrom'; next if $opt =~ m/^(?:unused|serial|usb)\d+$/; + next if $opt eq 'tags'; if ($cpuoptions->{$opt} || $opt =~ m/^numa\d+$/) { @@ -1559,6 +1559,27 @@ my $update_vm_api = sub { } PVE::QemuConfig->add_to_pending_delete($conf, $opt, $force); PVE::QemuConfig->write_config($vmid, $conf); + } elsif ($opt eq 'tags') { + my $check_admin = 0; + my $check_options = 0; + foreach my $tag (PVE::Tools::split_list($val)) { + if (PVE::JSONSchema::is_admin_pve_tag($tag)) { + $check_admin = 1; + } else { + $check_options = 1; + } + } + + if ($check_admin) { + $rpcenv->check($authuser, "/", ['Sys.Modify']); + } + + if ($check_options) { + $rpcenv->check_vm_perm($authuser, $vmid, undef, ['VM.Config.Options']); + } + + delete $conf->{$opt}; + PVE::QemuConfig->write_config($vmid, $conf); } else { PVE::QemuConfig->add_to_pending_delete($conf, $opt, $force); PVE::QemuConfig->write_config($vmid, $conf); @@ -1619,6 +1640,39 @@ my $update_vm_api = sub { die "only root can modify '$opt' config for real devices\n"; } $conf->{pending}->{$opt} = $param->{$opt}; + } elsif ($opt eq 'tags') { + my $check_admin = 0; + my $check_user = 0; + + my $old_tags = {}; + my $new_tags = {}; + + map { $old_tags->{$_} = 1 } PVE::Tools::split_list($conf->{$opt}); + map { $new_tags->{$_} = 1 } PVE::Tools::split_list($param->{$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, "/", ['VM.Config.Options']); + } + + if ($check_user) { + $rpcenv->check_vm_perm($authuser, $vmid, undef, ['VM.Config.Options']); + } + $conf->{pending}->{$opt} = $param->{$opt}; } else { $conf->{pending}->{$opt} = $param->{$opt}; diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index b3964bc..48247cc 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -698,7 +698,8 @@ EODESCR }, tags => { type => 'string', format => 'pve-tag-list', - description => 'Tags of the VM. This is only meta information.', + description => 'Tags of the VM. 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, }, rng0 => { -- 2.30.2