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 6F2CA6915A for ; Fri, 11 Mar 2022 12:25:54 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E6A3023679 for ; Fri, 11 Mar 2022 12:25:23 +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 B1FBB2356B for ; Fri, 11 Mar 2022 12:25:18 +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 89834463BD for ; Fri, 11 Mar 2022 12:25:18 +0100 (CET) From: Oguz Bektas To: pve-devel@lists.proxmox.com Date: Fri, 11 Mar 2022 12:24:59 +0100 Message-Id: <20220311112504.595964-8-o.bektas@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220311112504.595964-1-o.bektas@proxmox.com> References: <20220311112504.595964-1-o.bektas@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.594 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 - Subject: [pve-devel] [PATCH v2 manager 07/12] ui: adapt sensible 'root@pam' checks to SU privilege 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: Fri, 11 Mar 2022 11:25:54 -0000 so that SUs can perform some root-only actions over the GUI also silence eslint's warning about the access notation for these lines only. Signed-off-by: Oguz Bektas --- v1->v2: * silence eslint warnings * correct the conditional in Migrate.js * remove the unneeded/wrong ones (see fabian's previous review) www/manager6/dc/Config.js | 2 +- www/manager6/lxc/Options.js | 2 +- www/manager6/lxc/Resources.js | 2 +- www/manager6/window/Migrate.js | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/www/manager6/dc/Config.js b/www/manager6/dc/Config.js index 9c54b19d..0f70e33e 100644 --- a/www/manager6/dc/Config.js +++ b/www/manager6/dc/Config.js @@ -197,7 +197,7 @@ Ext.define('PVE.dc.Config', { }); } - if (Proxmox.UserName === 'root@pam') { + if (caps.dc['SuperUser']) { // eslint-disable-line me.items.push({ xtype: 'pveACMEClusterView', title: 'ACME', diff --git a/www/manager6/lxc/Options.js b/www/manager6/lxc/Options.js index f2661dfc..dce41505 100644 --- a/www/manager6/lxc/Options.js +++ b/www/manager6/lxc/Options.js @@ -136,7 +136,7 @@ Ext.define('PVE.lxc.Options', { features: { header: gettext('Features'), defaultValue: Proxmox.Utils.noneText, - editor: Proxmox.UserName === 'root@pam' || caps.vms['VM.Allocate'] + editor: caps.vms['SuperUser'] || caps.vms['VM.Allocate'] // eslint-disable-line ? 'PVE.lxc.FeaturesEdit' : undefined, }, hookscript: { diff --git a/www/manager6/lxc/Resources.js b/www/manager6/lxc/Resources.js index 15ee3c67..26e1bd36 100644 --- a/www/manager6/lxc/Resources.js +++ b/www/manager6/lxc/Resources.js @@ -257,7 +257,7 @@ Ext.define('PVE.lxc.RessourceView', { var isUsedDisk = isDisk && !isUnusedDisk; var noedit = rec.data.delete || !rowdef.editor; - if (!noedit && Proxmox.UserName !== 'root@pam' && key.match(/^mp\d+$/)) { + if (!noedit && !caps.vms['SuperUser'] && key.match(/^mp\d+$/)) { // eslint-disable-line var mp = PVE.Parser.parseLxcMountPoint(value); if (mp.type !== 'volume') { noedit = true; diff --git a/www/manager6/window/Migrate.js b/www/manager6/window/Migrate.js index 1c23abb3..597e3b0b 100644 --- a/www/manager6/window/Migrate.js +++ b/www/manager6/window/Migrate.js @@ -52,8 +52,8 @@ Ext.define('PVE.window.Migrate', { } }, setLocalResourceCheckboxHidden: function(get) { - if (get('running') || !get('migration.hasLocalResources') || - Proxmox.UserName !== 'root@pam') { + let caps = Ext.state.Manager.get('GuiCap'); + if (get('running') || !get('migration.hasLocalResources') || !caps.vms['SuperUser']) { // eslint-disable-line return true; } else { return false; -- 2.30.2