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 C795F6AC2C for ; Thu, 17 Mar 2022 11:05:17 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BC9D716CE for ; Thu, 17 Mar 2022 11:05:17 +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 id 78D9A16BC for ; Thu, 17 Mar 2022 11:05:16 +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 1DE5F426FD for ; Thu, 17 Mar 2022 11:05:16 +0100 (CET) Date: Thu, 17 Mar 2022 11:05:07 +0100 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20220311112504.595964-1-o.bektas@proxmox.com> <20220311112504.595964-3-o.bektas@proxmox.com> In-Reply-To: <20220311112504.595964-3-o.bektas@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.15.0 (https://github.com/astroidmail/astroid) Message-Id: <1647509888.r686k9qj6u.astroid@nora.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.183 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. [proxmox.com, qemu.pm] Subject: Re: [pve-devel] [PATCH v2 qemu-server 02/12] 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: Thu, 17 Mar 2022 10:05:17 -0000 On March 11, 2022 12:24 pm, 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 (such as `VM.Config.HWType`), as well as the SU > privilege. >=20 > Signed-off-by: Oguz Bektas > --- > v1->v2: > * add comments at the shortcuts for root@pam > * remove wrong shortcut for SU, instead check required privileges + SU > * revert migration-only parameters and vzdump internal ones >=20 >=20 > PVE/API2/Qemu.pm | 63 ++++++++++++++++++++++++------------------------ > 1 file changed, 32 insertions(+), 31 deletions(-) >=20 > diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm > index 68077cc..21fc82b 100644 > --- a/PVE/API2/Qemu.pm > +++ b/PVE/API2/Qemu.pm > @@ -352,16 +352,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); > + > 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} eq 'socket' || $is_superuser); check and message match, but not really. IMHO if $param->{$opt} ne 'socket' && !$is_superuser; matches the text of the message in a more readable fashion > } > =20 > return 1; > @@ -370,16 +371,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); > + > 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} =3D~ m/spice/ || $is_superuser); same here > } > =20 > return 1; > @@ -388,8 +390,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); > + > 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 > @@ -425,7 +430,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 > @@ -1117,6 +1123,8 @@ my $update_vm_api =3D sub { > push @paramarr, "-$key", $value; > } > =20 > + my $is_superuser =3D $authuser eq 'root@pam' || $rpcenv->check($auth= user, "/vms/$vmid", ['SuperUser'], 1); nit: line too long (I know, there are others as well, but that doesn't=20 mean we want to introduce even more mess ;)) not sure whether the shortcut here is worth it anyway, this is a single=20 call and we have a few others that are not skipped either. > + > my $skiplock =3D extract_param($param, 'skiplock'); > raise_param_exc({ skiplock =3D> "Only root may use this option." }) > if $skiplock && $authuser ne 'root@pam'; > @@ -1338,19 +1346,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 eq 'socket' || $is_superuser); condition style here > 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 =3D~ m/spice/ || $is_superuser); and here > PVE::QemuConfig->add_to_pending_delete($conf, $opt, $force); > PVE::QemuConfig->write_config($vmid, $conf); > } else { > @@ -1362,6 +1366,7 @@ my $update_vm_api =3D sub { > foreach my $opt (keys %$param) { # add/change > $modified->{$opt} =3D 1; > $conf =3D PVE::QemuConfig->load_config($vmid); # update/reload > + my $val =3D $conf->{$opt} // $conf->{pending}->{$opt}; no explanation for this change here, but $val now has the current value=20 if one is set, or the pending value if that is set. it seems to be copied from the code handling deletions (where this makes=20 sense - there is no new value in that case), but we want to ensure the=20 thing we remove is something we are allowed to add back/in the first=20 place. > next if defined($conf->{pending}->{$opt}) && ($param->{$opt} eq $conf-= >{pending}->{$opt}); # skip if nothing changed > =20 > my $arch =3D PVE::QemuServer::get_vm_arch($conf); > @@ -1390,18 +1395,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') { but here we have totally different rules applying, and can't just=20 apply the ones for deleting? this here checks both the old value if one=20 is set (which we remove) and the new value (which we set) > - $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 !($val eq 'socket' || $is_superuser); so this completely changes the semantics, no longer checking the new=20 value at all.. so again I wonder how did you test this? this allows=20 skipping the SU check as long as I first set the allowed value, and then=20 replace it with the high-privilege one.. > $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 !($val =3D~ m/spice/ || $is_superuser); same applies here.. > $conf->{pending}->{$opt} =3D $param->{$opt}; > } else { > $conf->{pending}->{$opt} =3D $param->{$opt}; > --=20 > 2.30.2 >=20 >=20 >=20 > _______________________________________________ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel >=20 >=20 >=20