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 640C9B289 for ; Wed, 6 Apr 2022 13:58:15 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 518212A804 for ; Wed, 6 Apr 2022 13:58:15 +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 ACE122A56D for ; Wed, 6 Apr 2022 13:58:05 +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 7ACD241CAC for ; Wed, 6 Apr 2022 13:58:05 +0200 (CEST) From: Oguz Bektas To: pve-devel@lists.proxmox.com Date: Wed, 6 Apr 2022 13:57:23 +0200 Message-Id: <20220406115734.898714-7-o.bektas@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220406115734.898714-1-o.bektas@proxmox.com> References: <20220406115734.898714-1-o.bektas@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.524 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 - Subject: [pve-devel] [PATCH v3 qemu-server 06/17] api: allow SU privileged users to edit root-only options for VM configs 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: Wed, 06 Apr 2022 11:58:15 -0000 we now allow users with SU privilege to edit real device configurations for VMs. they still need the required privilege to edit the corresponding configuration options (such as `VM.Config.HWType`), as well as the SU privilege. Signed-off-by: Oguz Bektas --- v2->v3: * changed condition styles * fix inverted condition for real device configs to also check current value PVE/API2/Qemu.pm | 62 ++++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index 1dd0cf2..7fc9a77 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -365,16 +365,17 @@ my $cloudinitoptions = { my $check_vm_create_serial_perm = sub { my ($rpcenv, $authuser, $vmid, $pool, $param) = @_; + # no need to check permissions for root@pam return 1 if $authuser eq 'root@pam'; + my $is_superuser = $rpcenv->check($authuser, "/vms/$vmid", ['SuperUser'], 1); + foreach my $opt (keys %{$param}) { next if $opt !~ m/^serial\d+$/; - if ($param->{$opt} eq 'socket') { - $rpcenv->check_vm_perm($authuser, $vmid, $pool, ['VM.Config.HWType']); - } else { - die "only root can set '$opt' config for real devices\n"; - } + $rpcenv->check_vm_perm($authuser, $vmid, $pool, ['VM.Config.HWType']); + die "only superusers can set '$opt' config for real devices\n" + if $param->{$opt} ne 'socket' && !$is_superuser; } return 1; @@ -383,16 +384,17 @@ my $check_vm_create_serial_perm = sub { my $check_vm_create_usb_perm = sub { my ($rpcenv, $authuser, $vmid, $pool, $param) = @_; + # no need to check permissions for root@pam return 1 if $authuser eq 'root@pam'; + my $is_superuser = $rpcenv->check($authuser, "/vms/$vmid", ['SuperUser'], 1); + foreach my $opt (keys %{$param}) { next if $opt !~ m/^usb\d+$/; - if ($param->{$opt} =~ m/spice/) { - $rpcenv->check_vm_perm($authuser, $vmid, $pool, ['VM.Config.HWType']); - } else { - die "only root can set '$opt' config for real devices\n"; - } + $rpcenv->check_vm_perm($authuser, $vmid, $pool, ['VM.Config.HWType']); + die "only superusers can set '$opt' config for real devices\n" + if $param->{$opt} !~ m/spice/ && !$is_superuser; } return 1; @@ -401,8 +403,11 @@ my $check_vm_create_usb_perm = sub { my $check_vm_modify_config_perm = sub { my ($rpcenv, $authuser, $vmid, $pool, $key_list) = @_; + # no need to check permissions for root@pam return 1 if $authuser eq 'root@pam'; + my $is_superuser = $rpcenv->check($authuser, "/vms/$vmid", ['SuperUser'], 1); + foreach my $opt (@$key_list) { # some checks (e.g., disk, serial port, usb) need to be done somewhere # else, as there the permission can be value dependend @@ -438,7 +443,8 @@ my $check_vm_modify_config_perm = sub { } else { # catches hostpci\d+, args, lock, etc. # new options will be checked here - die "only root can set '$opt' config\n"; + die "only superusers can set '$opt' config\n" + if !$is_superuser; } } @@ -1140,6 +1146,8 @@ my $update_vm_api = sub { push @paramarr, "-$key", $value; } + my $is_superuser = $rpcenv->check($authuser, "/vms/$vmid", ['SuperUser'], 1); + my $skiplock = extract_param($param, 'skiplock'); raise_param_exc({ skiplock => "Only root may use this option." }) if $skiplock && $authuser ne 'root@pam'; @@ -1356,19 +1364,15 @@ my $update_vm_api = sub { PVE::QemuConfig->add_to_pending_delete($conf, $opt, $force); PVE::QemuConfig->write_config($vmid, $conf); } elsif ($opt =~ m/^serial\d+$/) { - if ($val eq 'socket') { - $rpcenv->check_vm_perm($authuser, $vmid, undef, ['VM.Config.HWType']); - } elsif ($authuser ne 'root@pam') { - die "only root can delete '$opt' config for real devices\n"; - } + $rpcenv->check_vm_perm($authuser, $vmid, undef, ['VM.Config.HWType']); + die "only superusers can delete '$opt' config for real devices\n" + if $val ne 'socket' && !$is_superuser; PVE::QemuConfig->add_to_pending_delete($conf, $opt, $force); PVE::QemuConfig->write_config($vmid, $conf); } elsif ($opt =~ m/^usb\d+$/) { - if ($val =~ m/spice/) { - $rpcenv->check_vm_perm($authuser, $vmid, undef, ['VM.Config.HWType']); - } elsif ($authuser ne 'root@pam') { - die "only root can delete '$opt' config for real devices\n"; - } + $rpcenv->check_vm_perm($authuser, $vmid, undef, ['VM.Config.HWType']); + die "only superusers can delete '$opt' config for real devices\n" + if $val !~ m/spice/ && !$is_superuser; PVE::QemuConfig->add_to_pending_delete($conf, $opt, $force); PVE::QemuConfig->write_config($vmid, $conf); } else { @@ -1418,18 +1422,14 @@ my $update_vm_api = sub { } } } elsif ($opt =~ m/^serial\d+/) { - if ((!defined($conf->{$opt}) || $conf->{$opt} eq 'socket') && $param->{$opt} eq 'socket') { - $rpcenv->check_vm_perm($authuser, $vmid, undef, ['VM.Config.HWType']); - } elsif ($authuser ne 'root@pam') { - die "only root can modify '$opt' config for real devices\n"; - } + $rpcenv->check_vm_perm($authuser, $vmid, undef, ['VM.Config.HWType']); # always check hw config + die "only superusers can modify '$opt' config for real devices\n" + if !$is_superuser && ((defined($conf->{$opt}) && $conf->{$opt} ne 'socket') || $param->{$opt} ne 'socket'); $conf->{pending}->{$opt} = $param->{$opt}; } elsif ($opt =~ m/^usb\d+/) { - if ((!defined($conf->{$opt}) || $conf->{$opt} =~ m/spice/) && $param->{$opt} =~ m/spice/) { - $rpcenv->check_vm_perm($authuser, $vmid, undef, ['VM.Config.HWType']); - } elsif ($authuser ne 'root@pam') { - die "only root can modify '$opt' config for real devices\n"; - } + $rpcenv->check_vm_perm($authuser, $vmid, undef, ['VM.Config.HWType']); + die "only superusers can modify '$opt' config for real devices\n" + if !$is_superuser && ((defined($conf->{$opt}) && $conf->{$opt} !~ m/spice/) || $param->{$opt} !~ m/spice/); $conf->{pending}->{$opt} = $param->{$opt}; } else { $conf->{pending}->{$opt} = $param->{$opt}; -- 2.30.2