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 864AF6AEC7 for ; Thu, 17 Mar 2022 13:28:14 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7E3B83D51 for ; Thu, 17 Mar 2022 13:28:14 +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 8F19C3D45 for ; Thu, 17 Mar 2022 13:28:13 +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 63BB346EC0 for ; Thu, 17 Mar 2022 13:28:13 +0100 (CET) Date: Thu, 17 Mar 2022 13:28:05 +0100 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20220311112504.595964-1-o.bektas@proxmox.com> <20220311112504.595964-8-o.bektas@proxmox.com> In-Reply-To: <20220311112504.595964-8-o.bektas@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.15.0 (https://github.com/astroidmail/astroid) Message-Id: <1647519717.z2g9vswjy3.astroid@nora.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.181 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 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [proxmox.com] Subject: Re: [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: Thu, 17 Mar 2022 12:28:14 -0000 On March 11, 2022 12:24 pm, Oguz Bektas wrote: > so that SUs can perform some root-only actions over the GUI >=20 > also silence eslint's warning about the access notation for these lines > only. >=20 > 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) >=20 > 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(-) >=20 > 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', { > }); > } > =20 > - if (Proxmox.UserName =3D=3D=3D 'root@pam') { > + if (caps.dc['SuperUser']) { // eslint-disable-line > me.items.push({ > xtype: 'pveACMEClusterView', that one is still root only though in the backend? (and I am still missing some sort of overview of things you checked but=20 left as root-only intentional!) > 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 =3D=3D=3D 'root@pam' || caps.vms['VM.Allocate= '] > + editor: caps.vms['SuperUser'] || caps.vms['VM.Allocate'] // eslint-dis= able-line > ? 'PVE.lxc.FeaturesEdit' : undefined, this one requires a (trivial) rebase > }, > hookscript: { > diff --git a/www/manager6/lxc/Resources.js b/www/manager6/lxc/Resources.j= s > 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 =3D isDisk && !isUnusedDisk; > =20 > var noedit =3D rec.data.delete || !rowdef.editor; > - if (!noedit && Proxmox.UserName !=3D=3D 'root@pam' && key.match(/^m= p\d+$/)) { > + if (!noedit && !caps.vms['SuperUser'] && key.match(/^mp\d+$/)) { //= eslint-disable-line > var mp =3D PVE.Parser.parseLxcMountPoint(value); > if (mp.type !=3D=3D 'volume') { > noedit =3D 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 !=3D=3D 'root@pam') { > + let caps =3D Ext.state.Manager.get('GuiCap'); > + if (get('running') || !get('migration.hasLocalResources') || !caps.vms= ['SuperUser']) { // eslint-disable-line > return true; > } else { > return false; > --=20 > 2.30.2 >=20 >=20 >=20 > _______________________________________________ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel >=20 >=20 >=20