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 5A1768A81A for ; Wed, 27 Jul 2022 11:07:22 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 50FAC35CE for ; Wed, 27 Jul 2022 11:06:52 +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 ; Wed, 27 Jul 2022 11:06:51 +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 2A96843E44 for ; Wed, 27 Jul 2022 11:06:51 +0200 (CEST) Date: Wed, 27 Jul 2022 11:06:44 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Oguz Bektas , pve-devel@lists.proxmox.com References: <20220602072450.55209-1-o.bektas@proxmox.com> <20220602072450.55209-7-o.bektas@proxmox.com> In-Reply-To: <<20220602072450.55209-7-o.bektas@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.15.0 (https://github.com/astroidmail/astroid) Message-Id: <1658910302.24nfr3h59b.astroid@nora.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.163 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 Subject: Re: [pve-devel] [PATCH v4 qemu-server 06/18] 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, 27 Jul 2022 09:07:22 -0000 On June 2, 2022 9:24 am, Oguz Bektas wrote: > we now allow users with SU privilege to edit real device configurations > for VMs. >=20 > they still need the required privilege to edit the corresponding > configuration options (e.g. `VM.Config.HWType`), as well as the SU > privilege. >=20 > Co-authored-by: Fabian Gr=C3=BCnbichler > Signed-off-by: Oguz Bektas > --- > v3->v4: > * added fabian's tag there as well since he helped me a lot with this par= t >=20 >=20 > PVE/API2/Qemu.pm | 62 ++++++++++++++++++++++++------------------------ > 1 file changed, 31 insertions(+), 31 deletions(-) >=20 > diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm > index 99b426e..2e75ab6 100644 > --- a/PVE/API2/Qemu.pm > +++ b/PVE/API2/Qemu.pm > @@ -545,16 +545,17 @@ my $cloudinitoptions =3D { > my $check_vm_create_serial_perm =3D sub { > my ($rpcenv, $authuser, $vmid, $pool, $param) =3D @_; > =20 > + # no need to check permissions for root@pam > return 1 if $authuser eq 'root@pam'; > =20 > + my $is_superuser =3D $rpcenv->check($authuser, "/vms/$vmid", ['Super= User'], 1); this could switch to check_vm_perm if we want to extend the pool-based=20 ACL to SU as well for VM creation. the vmid is not added to the pool yet=20 at that point, so just checking /vms/$vmid doesn't work. but likely=20 anybody who has superuser on a full pool and needs it to create=20 superuser-restricted VMs already has superuser globally anyway, so not=20 that important. > + > foreach my $opt (keys %{$param}) { > next if $opt !~ m/^serial\d+$/; > =20 > - 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; > } > =20 > return 1; > @@ -563,16 +564,17 @@ my $check_vm_create_serial_perm =3D sub { > my $check_vm_create_usb_perm =3D sub { > my ($rpcenv, $authuser, $vmid, $pool, $param) =3D @_; > =20 > + # no need to check permissions for root@pam > return 1 if $authuser eq 'root@pam'; > =20 > + my $is_superuser =3D $rpcenv->check($authuser, "/vms/$vmid", ['Super= User'], 1); same here > + > foreach my $opt (keys %{$param}) { > next if $opt !~ m/^usb\d+$/; > =20 > - if ($param->{$opt} =3D~ 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; > } > =20 > return 1; > @@ -581,8 +583,11 @@ my $check_vm_create_usb_perm =3D sub { > my $check_vm_modify_config_perm =3D sub { > my ($rpcenv, $authuser, $vmid, $pool, $key_list) =3D @_; > =20 > + # no need to check permissions for root@pam > return 1 if $authuser eq 'root@pam'; > =20 > + my $is_superuser =3D $rpcenv->check($authuser, "/vms/$vmid", ['Super= User'], 1); and here > + > 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 > @@ -618,7 +623,8 @@ my $check_vm_modify_config_perm =3D 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; > } > } > =20 > @@ -1328,6 +1334,8 @@ my $update_vm_api =3D sub { > push @paramarr, "-$key", $value; > } > =20 > + my $is_superuser =3D $rpcenv->check($authuser, "/vms/$vmid", ['Super= User'], 1); but not here ;) > + > my $skiplock =3D extract_param($param, 'skiplock'); > raise_param_exc({ skiplock =3D> "Only root may use this option." }) > if $skiplock && $authuser ne 'root@pam'; > @@ -1544,19 +1552,15 @@ my $update_vm_api =3D sub { > PVE::QemuConfig->add_to_pending_delete($conf, $opt, $force); > PVE::QemuConfig->write_config($vmid, $conf); > } elsif ($opt =3D~ 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 =3D~ m/^usb\d+$/) { > - if ($val =3D~ 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 { > @@ -1606,18 +1610,14 @@ my $update_vm_api =3D sub { > } > } > } elsif ($opt =3D~ m/^serial\d+/) { > - if ((!defined($conf->{$opt}) || $conf->{$opt} eq 'socket') && $par= am->{$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 nit: that comment is not needed > + die "only superusers can modify '$opt' config for real devices\n" > + if !$is_superuser && ((defined($conf->{$opt}) && $conf->{$opt} ne 'so= cket') || $param->{$opt} ne 'socket'); > $conf->{pending}->{$opt} =3D $param->{$opt}; > } elsif ($opt =3D~ m/^usb\d+/) { > - if ((!defined($conf->{$opt}) || $conf->{$opt} =3D~ m/spice/) && $p= aram->{$opt} =3D~ 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/s= pice/) || $param->{$opt} !~ m/spice/); > $conf->{pending}->{$opt} =3D $param->{$opt}; > } else { > $conf->{pending}->{$opt} =3D $param->{$opt}; > --=20 > 2.30.2 >=20 >=20