From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Subject: Re: [pve-devel] [RFC/PATCH manager] ui: lxc options: disable features edit as non-root when container is privileged
Date: Thu, 12 Aug 2021 11:45:25 +0200 [thread overview]
Message-ID: <1628760513.6td199p09f.astroid@nora.none> (raw)
In-Reply-To: <20210806085927.31277-1-f.ebner@proxmox.com>
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.
>
> Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
> ---
> www/manager6/lxc/Options.js | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> 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 = rec.data.delete || me.hasPendingChanges(key);
> var rowdef = rows[key];
>
> - edit_btn.setDisabled(!rowdef.editor);
> + let unprivileged = me.getStore().getById('unprivileged').data.value;
> + let nonRootPrivFeatures =
> + Proxmox.UserName !== 'root@pam' && key === 'features' && !unprivileged;
> +
> + edit_btn.setDisabled(!rowdef.editor || nonRootPrivFeatures);
this reads strange to me, maybe
if (key === 'features') {
let unprivileged = ..;
let root = ..;
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
definition for 'features' more simple, and pull the VM.Allocate check
down here (to avoid splitting the decision into two parts and missing
that fact in the future).
> revert_btn.setDisabled(!pending);
> };
>
> --
> 2.30.2
>
>
>
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
>
>
>
prev parent reply other threads:[~2021-08-12 9:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-06 8:59 Fabian Ebner
2021-08-12 9:45 ` Fabian Grünbichler [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1628760513.6td199p09f.astroid@nora.none \
--to=f.gruenbichler@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox