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 2783191621 for ; Mon, 14 Nov 2022 10:44:13 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9A0FC210A4 for ; Mon, 14 Nov 2022 10:44:12 +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 10:44:07 +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 1DA7443D36 for ; Mon, 14 Nov 2022 10:44:07 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Mon, 14 Nov 2022 10:43:49 +0100 Message-Id: <20221114094404.1241050-6-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221114094404.1241050-1-d.csapak@proxmox.com> References: <20221114094404.1241050-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: =?UTF-8?Q?0=0A=09?=AWL 0.065 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: [pve-devel] [PATCH qemu-server v9 1/1] api: update: 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 09:44:13 -0000 '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) PVE/API2/Qemu.pm | 53 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index 30348e6..269451c 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -539,7 +539,6 @@ my $generaloptions = { 'startup' => 1, 'tdf' => 1, 'template' => 1, - 'tags' => 1, }; my $vmpoweroptions = { @@ -609,6 +608,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+$/) { @@ -1631,6 +1631,31 @@ my $update_vm_api = sub { } }; + 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 { + 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; + } + }; + foreach my $opt (@delete) { $modified->{$opt} = 1; $conf = PVE::QemuConfig->load_config($vmid); # update/reload @@ -1689,6 +1714,13 @@ my $update_vm_api = sub { } PVE::QemuConfig->add_to_pending_delete($conf, $opt, $force); PVE::QemuConfig->write_config($vmid, $conf); + } elsif ($opt eq 'tags') { + foreach my $tag (PVE::Tools::split_list($val)) { + check_tag_perms->($tag); + } + + 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); @@ -1748,6 +1780,25 @@ my $update_vm_api = sub { } elsif ($authuser ne 'root@pam') { die "only root can modify '$opt' config for real devices\n"; } + $conf->{pending}->{$opt} = $param->{$opt}; + } elsif ($opt eq 'tags') { + 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} // 0) == ($a->{$tag} // 0); + $check_tag_perms->($tag); + } + }; + + $check_tags->($old_tags, $new_tags); + $check_tags->($new_tags, $old_tags); + $conf->{pending}->{$opt} = $param->{$opt}; } else { $conf->{pending}->{$opt} = $param->{$opt}; -- 2.30.2