* [pve-devel] [PATCH qemu-server] fix #5574: api: fix permission check for 'spice' usb port
@ 2024-07-08 11:56 Dominik Csapak
2024-07-22 17:38 ` [pve-devel] applied: " Thomas Lamprecht
0 siblings, 1 reply; 2+ messages in thread
From: Dominik Csapak @ 2024-07-08 11:56 UTC (permalink / raw)
To: pve-devel
With the last change in the permission check, I accidentally broke the
check for 'spice' host value, since in the if/elsif/else this will fall
through to the else case which was only intended for when neither 'host'
nor 'mapping' was set.
This made 'spice' only settable by root@pam since there we return early.
To fix this, move the spice check into the 'host' branch, but only error
out in case it's not spice.
Fixes: e3971865 (enable cluster mapped USB devices for guests)
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
PVE/API2/Qemu.pm | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index efe69b5c..a3313f3a 100644
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -661,8 +661,12 @@ my sub check_usb_perm {
$rpcenv->check_vm_perm($authuser, $vmid, $pool, ['VM.Config.HWType']);
my $device = PVE::JSONSchema::parse_property_string('pve-qm-usb', $value);
- if ($device->{host} && $device->{host} !~ m/^spice$/i) {
- die "only root can set '$opt' config for real devices\n";
+ if ($device->{host}) {
+ if ($device->{host} =~ m/^spice$/i) {
+ # already checked generic permission above
+ } else {
+ die "only root can set '$opt' config for real devices\n";
+ }
} elsif ($device->{mapping}) {
$rpcenv->check_full($authuser, "/mapping/usb/$device->{mapping}", ['Mapping.Use']);
} else {
--
2.39.2
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
* [pve-devel] applied: [PATCH qemu-server] fix #5574: api: fix permission check for 'spice' usb port
2024-07-08 11:56 [pve-devel] [PATCH qemu-server] fix #5574: api: fix permission check for 'spice' usb port Dominik Csapak
@ 2024-07-22 17:38 ` Thomas Lamprecht
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Lamprecht @ 2024-07-22 17:38 UTC (permalink / raw)
To: Proxmox VE development discussion, Dominik Csapak
Am 08/07/2024 um 13:56 schrieb Dominik Csapak:
> With the last change in the permission check, I accidentally broke the
> check for 'spice' host value, since in the if/elsif/else this will fall
> through to the else case which was only intended for when neither 'host'
> nor 'mapping' was set.
>
> This made 'spice' only settable by root@pam since there we return early.
>
> To fix this, move the spice check into the 'host' branch, but only error
> out in case it's not spice.
>
> Fixes: e3971865 (enable cluster mapped USB devices for guests)
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
> PVE/API2/Qemu.pm | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
>
applied, thanks!
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-07-22 17:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-07-08 11:56 [pve-devel] [PATCH qemu-server] fix #5574: api: fix permission check for 'spice' usb port Dominik Csapak
2024-07-22 17:38 ` [pve-devel] applied: " Thomas Lamprecht
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox