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 4CD028A828 for ; Wed, 27 Jul 2022 11:07:40 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4AC3A36F0 for ; Wed, 27 Jul 2022 11:07:40 +0200 (CEST) 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 ; Wed, 27 Jul 2022 11:07:38 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 7D2A143E44 for ; Wed, 27 Jul 2022 11:07:38 +0200 (CEST) Date: Wed, 27 Jul 2022 11:07:32 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20220602072450.55209-1-o.bektas@proxmox.com> <20220602072450.55209-16-o.bektas@proxmox.com> In-Reply-To: <<20220602072450.55209-16-o.bektas@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.15.0 (https://github.com/astroidmail/astroid) Message-Id: <1658911289.ozmrbd1pt6.astroid@nora.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.163 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: Re: [pve-devel] [PATCH v4 manager 15/18] ui: adapt sensible 'root@pam' checks to SU 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: Wed, 27 Jul 2022 09:07:40 -0000 On June 2, 2022 9:24 am, Oguz Bektas wrote: > Signed-off-by: Oguz Bektas > --- > * left off ceph since we drop to a /bin/login shell anyways >=20 > www/manager6/lxc/Resources.js | 6 +++--- > www/manager6/window/Migrate.js | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) >=20 > diff --git a/www/manager6/lxc/Resources.js b/www/manager6/lxc/Resources.j= s > index 4b2ae95e..f82d056d 100644 > --- a/www/manager6/lxc/Resources.js > +++ b/www/manager6/lxc/Resources.js > @@ -306,9 +306,9 @@ Ext.define('PVE.lxc.RessourceView', { > let isUnusedDisk =3D key.match(/^unused\d+/); > let isUsedDisk =3D isDisk && !isUnusedDisk; > =20 > - let noedit =3D isDelete || !rowdef.editor; > - if (!noedit && Proxmox.UserName !=3D=3D 'root@pam' && key.match(/^m= p\d+$/)) { > - let mp =3D PVE.Parser.parseLxcMountPoint(value); > + var noedit =3D rec.data.delete || !rowdef.editor; nit: why not keep the isDelete like in the rest of the code above? > + 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