From: Wolfgang Bumiller <w.bumiller@proxmox.com>
To: Dominik Csapak <d.csapak@proxmox.com>
Cc: pve-devel@lists.proxmox.com
Subject: Re: [pve-devel] [PATCH container 2/2] allow nesting to be changed for VM.Allocate on unprivileged containers
Date: Wed, 4 Aug 2021 10:53:25 +0200 [thread overview]
Message-ID: <20210804085325.is2yzmidejwnzgzp@wobu-vie.proxmox.com> (raw)
In-Reply-To: <20210803122954.2641138-3-d.csapak@proxmox.com>
On Tue, Aug 03, 2021 at 02:29:52PM +0200, Dominik Csapak wrote:
> instead of it being root only
>
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
> src/PVE/LXC.pm | 43 +++++++++++++++++++++++++++++++++++++++++--
> 1 file changed, 41 insertions(+), 2 deletions(-)
>
> diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm
> index 32a2127..abe8ac3 100644
> --- a/src/PVE/LXC.pm
> +++ b/src/PVE/LXC.pm
> @@ -1270,8 +1270,47 @@ sub check_ct_modify_config_perm {
> $opt eq 'searchdomain' || $opt eq 'hostname') {
> $rpcenv->check_vm_perm($authuser, $vmid, $pool, ['VM.Config.Network']);
> } elsif ($opt eq 'features') {
> - # For now this is restricted to root@pam
> - raise_perm_exc("changing feature flags is only allowed for root\@pam");
> + raise_perm_exc("changing feature flags for privileged container is only allowed for root\@pam")
> + if !$unprivileged;
> +
> + my $nesting_changed = 0;
> + my $other_changed = 0;
> + if (!$delete) {
> + my $features = PVE::LXC::Config->parse_features($newconf->{$opt});
> + if (defined($oldconf) && $oldconf->{$opt}) {
> + # existing container with features
> + my $old_features = PVE::LXC::Config->parse_features($oldconf->{$opt});
> + for my $feature ((keys %$old_features, keys %$features)) {
> + if ($old_features->{$feature} ne $features->{$feature}) {
> + if ($feature eq 'nesting') {
> + $nesting_changed = 1;
> + next;
> + } else {
> + $other_changed = 1;
> + last;
Breaking out here means you *tend* to prefer the `other_changed` error, but...
> + }
> + }
> + }
> + } else {
> + # new container or no features defined
> + if (scalar(keys %$features) == 1 && $features->{nesting}) {
> + $nesting_changed = 1;
> + } elsif (scalar(keys %$features) > 0) {
> + $other_changed = 1;
> + }
> + }
> + } else {
> + my $features = PVE::LXC::Config->parse_features($oldconf->{$opt});
> + if (scalar(keys %$features) == 1 && $features->{nesting}) {
...here you prefer the nesting check, but only if nothing else
changes alongside it...
> + $nesting_changed = 1;
> + } elsif (scalar(keys %$features) > 0) {
> + $other_changed = 1;
> + }
> + }
> + $rpcenv->check_vm_perm($authuser, $vmid, $pool, ['VM.Allocate'])
> + if $nesting_changed;
...but hash key randomization may randomly give you $nesting_changed=1
first and cause this message to appear instead of the one below.
So we should probably swap the two checks for consistency?
> + raise_perm_exc("changing feature flags (except nesting) is only allowed for root\@pam")
> + if $other_changed;
> } elsif ($opt eq 'hookscript') {
> # For now this is restricted to root@pam
> raise_perm_exc("changing the hookscript is only allowed for root\@pam");
> --
> 2.30.2
next prev parent reply other threads:[~2021-08-04 8:53 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-03 12:29 [pve-devel] [PATCH container/manager] default nesting for unpriv containers in ui Dominik Csapak
2021-08-03 12:29 ` [pve-devel] [PATCH container 1/2] add old config and unprivileged to check_ct_modify_config_perm Dominik Csapak
2021-08-04 8:45 ` Wolfgang Bumiller
2021-08-04 8:47 ` Fabian Ebner
2021-08-04 8:49 ` Fabian Ebner
2021-08-03 12:29 ` [pve-devel] [PATCH container 2/2] allow nesting to be changed for VM.Allocate on unprivileged containers Dominik Csapak
2021-08-04 8:53 ` Wolfgang Bumiller [this message]
2021-08-04 8:57 ` Fabian Ebner
2021-08-03 12:29 ` [pve-devel] [PATCH manager 1/2] ui: lxc/Options: allow opening features window for VM.Allocate Dominik Csapak
2021-08-03 12:29 ` [pve-devel] [PATCH manager 2/2] ui: lxc/CreateWizard: add a 'nesting' checkbox and enable it by default Dominik Csapak
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=20210804085325.is2yzmidejwnzgzp@wobu-vie.proxmox.com \
--to=w.bumiller@proxmox.com \
--cc=d.csapak@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