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 A0EC36CF39 for ; Thu, 12 Aug 2021 11:46:07 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8BF1A2155F for ; Thu, 12 Aug 2021 11:45:37 +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 id B79C721554 for ; Thu, 12 Aug 2021 11:45:33 +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 8479443303 for ; Thu, 12 Aug 2021 11:45:33 +0200 (CEST) Date: Thu, 12 Aug 2021 11:45:25 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20210806085927.31277-1-f.ebner@proxmox.com> In-Reply-To: <20210806085927.31277-1-f.ebner@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.15.0 (https://github.com/astroidmail/astroid) Message-Id: <1628760513.6td199p09f.astroid@nora.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.434 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] [RFC/PATCH manager] ui: lxc options: disable features edit as non-root when container is privileged 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, 12 Aug 2021 09:46:07 -0000 On August 6, 2021 10:59 am, Fabian Ebner wrote: > The backend won't allow any edits in this case, so better just disable > the edit button altogether. >=20 > Signed-off-by: Fabian Ebner > --- > www/manager6/lxc/Options.js | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) >=20 > diff --git a/www/manager6/lxc/Options.js b/www/manager6/lxc/Options.js > index f2661dfc..12b0fe12 100644 > --- a/www/manager6/lxc/Options.js > +++ b/www/manager6/lxc/Options.js > @@ -174,7 +174,11 @@ Ext.define('PVE.lxc.Options', { > var pending =3D rec.data.delete || me.hasPendingChanges(key); > var rowdef =3D rows[key]; > =20 > - edit_btn.setDisabled(!rowdef.editor); > + let unprivileged =3D me.getStore().getById('unprivileged').data.val= ue; > + let nonRootPrivFeatures =3D > + Proxmox.UserName !=3D=3D 'root@pam' && key =3D=3D=3D 'features' && !un= privileged; > + > + edit_btn.setDisabled(!rowdef.editor || nonRootPrivFeatures); this reads strange to me, maybe if (key =3D=3D=3D 'features') { let unprivileged =3D ..; let root =3D ..; edit_btn.setDisabled(!rowdef.editor || (!unprivileged && !root)); } else { edit_btn.setDisabled(!rowdef.editor); } is more clear? might even make sense to make the rowdef.editor=20 definition for 'features' more simple, and pull the VM.Allocate check=20 down here (to avoid splitting the decision into two parts and missing=20 that fact in the future). > revert_btn.setDisabled(!pending); > }; > =20 > --=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