proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-15 11:04:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix #4321: properly check cloud-init drive permissions

Browse Source 
Checking for only Sys.Console prevents users who actually have the
correct permissions (VM.Config.CDROM, VM.Config.Cloudinit) from adding
a new cloud-init drive. Some checks needed to be adapted so that editing
cloud-init devices was possible with VM.Config.CDROM instead of
VM.Config.Disk.

Signed-off-by: Leo Nunner <l.nunner@proxmox.com>
This commit is contained in:
Leo Nunner 2022-11-16 18:34:28 +01:00 committed by Dominik Csapak
parent 5f1b4ea387
commit ad1d539e43
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
www/manager6/qemu/HardwareView.js
View File

@ -580,6 +580,8 @@ Ext.define('PVE.qemu.HardwareView', {
const noVMConfigHWTypePerm = !caps.vms['VM.Config.HWType']; const noVMConfigHWTypePerm = !caps.vms['VM.Config.HWType'];
const noVMConfigNetPerm = !caps.vms['VM.Config.Network']; const noVMConfigNetPerm = !caps.vms['VM.Config.Network'];
const noVMConfigDiskPerm = !caps.vms['VM.Config.Disk']; const noVMConfigDiskPerm = !caps.vms['VM.Config.Disk'];
const noVMConfigCDROMPerm = !caps.vms['VM.Config.CDROM'];
const noVMConfigCloudinitPerm = !caps.vms['VM.Config.Cloudinit'];
me.down('#addUsb').setDisabled(noSysConsolePerm || isAtUsbLimit()); me.down('#addUsb').setDisabled(noSysConsolePerm || isAtUsbLimit());
me.down('#addPci').setDisabled(noSysConsolePerm || isAtLimit('hostpci')); me.down('#addPci').setDisabled(noSysConsolePerm || isAtLimit('hostpci'));
@ -589,7 +591,7 @@ Ext.define('PVE.qemu.HardwareView', {
me.down('#addRng').setDisabled(noSysConsolePerm || isAtLimit('rng')); me.down('#addRng').setDisabled(noSysConsolePerm || isAtLimit('rng'));
efidisk_menuitem.setDisabled(noVMConfigDiskPerm || isAtLimit('efidisk')); efidisk_menuitem.setDisabled(noVMConfigDiskPerm || isAtLimit('efidisk'));
me.down('#addTpmState').setDisabled(noSysConsolePerm || isAtLimit('tpmstate')); me.down('#addTpmState').setDisabled(noSysConsolePerm || isAtLimit('tpmstate'));
me.down('#addCloudinitDrive').setDisabled(noSysConsolePerm || hasCloudInit); me.down('#addCloudinitDrive').setDisabled(noVMConfigCDROMPerm || noVMConfigCloudinitPerm || hasCloudInit);
if (!rec) { if (!rec) {
remove_btn.disable(); remove_btn.disable();
@ -605,11 +607,11 @@ Ext.define('PVE.qemu.HardwareView', {
const pending = deleted || me.hasPendingChanges(key); const pending = deleted || me.hasPendingChanges(key);
const isCloudInit = isCloudInitKey(value); const isCloudInit = isCloudInitKey(value);
const isCDRom = value && !!value.toString().match(/media=cdrom/) && !isCloudInit; const isCDRom = value && !!value.toString().match(/media=cdrom/);
const isUnusedDisk = key.match(/^unused\d+/); const isUnusedDisk = key.match(/^unused\d+/);
const isUsedDisk = !isUnusedDisk && row.isOnStorageBus && !isCDRom && !isCloudInit; const isUsedDisk = !isUnusedDisk && row.isOnStorageBus && !isCDRom;
const isDisk = isCloudInit || isUnusedDisk || isUsedDisk; const isDisk = isUnusedDisk || isUsedDisk;
const isEfi = key === 'efidisk0'; const isEfi = key === 'efidisk0';
const tpmMoveable = key === 'tpmstate0' && !me.pveSelNode.data.running; const tpmMoveable = key === 'tpmstate0' && !me.pveSelNode.data.running;
@ -712,7 +714,7 @@ Ext.define('PVE.qemu.HardwareView', {
text: gettext('CloudInit Drive'), text: gettext('CloudInit Drive'),
itemId: 'addCloudinitDrive', itemId: 'addCloudinitDrive',
iconCls: 'fa fa-fw fa-cloud black', iconCls: 'fa fa-fw fa-cloud black',
disabled: !caps.nodes['Sys.Console'], disabled: !caps.vms['VM.Config.CDROM'] || !caps.vms['VM.Config.Cloudinit'],
handler: editorFactory('CIDriveEdit'), handler: editorFactory('CIDriveEdit'),
}, },
{ {