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 A3A688C8E9 for ; Thu, 3 Nov 2022 14:05:54 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8953830868 for ; Thu, 3 Nov 2022 14:05:54 +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 ; Thu, 3 Nov 2022 14:05:53 +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 C7D3644D00 for ; Thu, 3 Nov 2022 14:05:52 +0100 (CET) From: Leo Nunner To: pve-devel@lists.proxmox.com Date: Thu, 3 Nov 2022 14:04:23 +0100 Message-Id: <20221103130423.52460-3-l.nunner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221103130423.52460-1-l.nunner@proxmox.com> References: <20221103130423.52460-1-l.nunner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.135 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: [pve-devel] [PATCH manager 1/1] fix #4321: properly check cloud-init drive permissions 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, 03 Nov 2022 13:05:54 -0000 Checking for only Sys.Console prevents users who actually have the correct permissions (VM.Config.Disk, VM.Config.Cloudinit) from adding a new cloud-init drive. Signed-off-by: Leo Nunner --- www/manager6/qemu/HardwareView.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/www/manager6/qemu/HardwareView.js b/www/manager6/qemu/HardwareView.js index 6e9d03b4..c7843b82 100644 --- a/www/manager6/qemu/HardwareView.js +++ b/www/manager6/qemu/HardwareView.js @@ -569,6 +569,7 @@ Ext.define('PVE.qemu.HardwareView', { const noVMConfigHWTypePerm = !caps.vms['VM.Config.HWType']; const noVMConfigNetPerm = !caps.vms['VM.Config.Network']; const noVMConfigDiskPerm = !caps.vms['VM.Config.Disk']; + const noVMConfigCloudinitPerm = !caps.vms['VM.Config.Cloudinit']; me.down('#addUsb').setDisabled(noSysConsolePerm || isAtLimit('usb')); me.down('#addPci').setDisabled(noSysConsolePerm || isAtLimit('hostpci')); @@ -578,7 +579,7 @@ Ext.define('PVE.qemu.HardwareView', { me.down('#addRng').setDisabled(noSysConsolePerm || isAtLimit('rng')); efidisk_menuitem.setDisabled(noVMConfigDiskPerm || isAtLimit('efidisk')); me.down('#addTpmState').setDisabled(noSysConsolePerm || isAtLimit('tpmstate')); - me.down('#addCloudinitDrive').setDisabled(noSysConsolePerm || hasCloudInit); + me.down('#addCloudinitDrive').setDisabled(noVMConfigDiskPerm || noVMConfigCloudinitPerm || hasCloudInit); if (!rec) { remove_btn.disable(); @@ -701,7 +702,7 @@ Ext.define('PVE.qemu.HardwareView', { text: gettext('CloudInit Drive'), itemId: 'addCloudinitDrive', iconCls: 'fa fa-fw fa-cloud black', - disabled: !caps.nodes['Sys.Console'], + disabled: !caps.vms['Vm.Config.Disk'] || !caps.vms['Vm.Config.Cloudinit'], handler: editorFactory('CIDriveEdit'), }, { -- 2.30.2