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 B2AA56118A for ; Tue, 8 Feb 2022 14:10:51 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 933BD2EC77 for ; Tue, 8 Feb 2022 14:10:21 +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 46C5D2EC60 for ; Tue, 8 Feb 2022 14:10:20 +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 1712D456AF for ; Tue, 8 Feb 2022 14:10:20 +0100 (CET) From: Oguz Bektas To: pve-devel@lists.proxmox.com Date: Tue, 8 Feb 2022 14:10:10 +0100 Message-Id: <20220208131011.752134-5-o.bektas@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220208131011.752134-1-o.bektas@proxmox.com> References: <20220208131011.752134-1-o.bektas@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.653 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 v1 manager 4/5] change 'root@pam' checks with 'SuperUser' capability check 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: Tue, 08 Feb 2022 13:10:51 -0000 'root@pam' has the privilege by default (since it's an SA), so we can drop the string comparisons all around and check that privilege instead when deciding to enable/disable buttons or views Signed-off-by: Oguz Bektas --- www/manager6/Utils.js | 3 ++- www/manager6/dc/Config.js | 2 +- www/manager6/dc/UserView.js | 2 +- www/manager6/lxc/Options.js | 2 +- www/manager6/lxc/Resources.js | 2 +- www/manager6/node/Config.js | 2 +- www/manager6/window/Migrate.js | 4 ++-- 7 files changed, 9 insertions(+), 8 deletions(-) diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js index aafe359a..31ab94e8 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -1656,7 +1656,8 @@ Ext.define('PVE.Utils', { showCephInstallOrMask: function(container, msg, nodename, callback) { if (msg.match(/not (installed|initialized)/i)) { - if (Proxmox.UserName === 'root@pam') { + let caps = Ext.state.Manager.get('GuiCap'); + if (caps.node.SuperUser) { container.el.mask(); if (!container.down('pveCephInstallWindow')) { var isInstalled = !!msg.match(/not initialized/i); diff --git a/www/manager6/dc/Config.js b/www/manager6/dc/Config.js index 9c54b19d..917c426f 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) { me.items.push({ xtype: 'pveACMEClusterView', title: 'ACME', diff --git a/www/manager6/dc/UserView.js b/www/manager6/dc/UserView.js index bbfc4f7c..fe0c0149 100644 --- a/www/manager6/dc/UserView.js +++ b/www/manager6/dc/UserView.js @@ -29,7 +29,7 @@ Ext.define('PVE.dc.UserView', { selModel: sm, baseurl: '/access/users/', dangerous: true, - enableFn: rec => caps.access['User.Modify'] && rec.data.userid !== 'root@pam', + enableFn: rec => caps.access['User.Modify'] && !caps.access.SuperUser, callback: () => reload(), }); let run_editor = function() { diff --git a/www/manager6/lxc/Options.js b/www/manager6/lxc/Options.js index f2661dfc..f8eb8a5c 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'] ? 'PVE.lxc.FeaturesEdit' : undefined, }, hookscript: { diff --git a/www/manager6/lxc/Resources.js b/www/manager6/lxc/Resources.js index 15ee3c67..2081b4a2 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+$/)) { var mp = PVE.Parser.parseLxcMountPoint(value); if (mp.type !== 'volume') { noedit = true; diff --git a/www/manager6/node/Config.js b/www/manager6/node/Config.js index 68f80391..9f49f0dd 100644 --- a/www/manager6/node/Config.js +++ b/www/manager6/node/Config.js @@ -236,7 +236,7 @@ Ext.define('PVE.node.Config', { itemId: 'apt', upgradeBtn: { xtype: 'pveConsoleButton', - disabled: Proxmox.UserName !== 'root@pam', + disabled: !caps.nodes.SuperUser, text: gettext('Upgrade'), consoleType: 'upgrade', nodename: nodename, diff --git a/www/manager6/window/Migrate.js b/www/manager6/window/Migrate.js index 1c23abb3..20fcf81d 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) { return true; } else { return false; -- 2.30.2