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 E79F6862F for ; Tue, 15 Nov 2022 16:18:36 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C73395652 for ; Tue, 15 Nov 2022 16:18:06 +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 for ; Tue, 15 Nov 2022 16:18:04 +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 4D59D44C8D for ; Tue, 15 Nov 2022 16:18:04 +0100 (CET) Date: Tue, 15 Nov 2022 16:17:56 +0100 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20221115130248.1007325-1-d.csapak@proxmox.com> <20221115130248.1007325-5-d.csapak@proxmox.com> In-Reply-To: <20221115130248.1007325-5-d.csapak@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1668524410.yomu90q6hb.astroid@yuna.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: =?UTF-8?Q?0=0A=09?=AWL 0.140 Adjusted score from AWL reputation of From: =?UTF-8?Q?address=0A=09?=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 =?UTF-8?Q?Alignment=0A=09?=SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF =?UTF-8?Q?Record=0A=09?=SPF_PASS -0.001 SPF: sender matches SPF =?UTF-8?Q?record=0A=09?=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, datacenterconfig.pm] Subject: Re: [pve-devel] [PATCH cluster v10 4/5] datacenter.cfg: add tag rights control to the datacenter config 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: Tue, 15 Nov 2022 15:18:36 -0000 On November 15, 2022 2:02 pm, Dominik Csapak wrote: > by adding a 'user-tag-privileges' and 'admin-tags' option. > The first sets the policy by which "normal" users (with > 'VM.Config.Options' on the respective guest) can create/delete tags > and the second is a list of tags only settable by 'admins' > ('Sys.Modify' on '/') >=20 > also add a helper 'get_allowed_tags' that returns the allowed (existing) > tags, the privileged tags, and if a user can enter 'freeform' tags. >=20 > Signed-off-by: Dominik Csapak > --- > changes from v9: > * get_allowed_tags now takes a bool + closure for checking the tag > access, prevents cyclic dependency between cluster and access-control > * use 'for' instead of 'map' > * fix indentation > data/PVE/DataCenterConfig.pm | 105 +++++++++++++++++++++++++++++++++++ > 1 file changed, 105 insertions(+) >=20 > diff --git a/data/PVE/DataCenterConfig.pm b/data/PVE/DataCenterConfig.pm > index 532e5e5..f7f90e9 100644 > --- a/data/PVE/DataCenterConfig.pm > +++ b/data/PVE/DataCenterConfig.pm > @@ -154,6 +154,32 @@ my $tag_style_format =3D { > }, > }; > =20 > +my $user_tag_privs_format =3D { > + 'user-allow' =3D> { > + optional =3D> 1, > + type =3D> 'string', > + enum =3D> ['none', 'list', 'existing', 'free'], > + default =3D> 'free', > + description =3D> "Controls tag usage for users without `Sys.Modify` on = `/` bey either " by > + ."allowing `none`, a `list`, already `existing` or anything (`free`= ).", > + verbose_description =3D> "Controls which tags can be set or deleted on = resources an user " "a" user > + ."controls (such as guests). Users iwth the `Sys.Modify` privilege = on `/` are always " with > + ." unrestricted. " > + ."'none' means no tags are modifiable. " > + ."'list' allows tags from the given list. " > + ."'existing' means only already existing tags of resources able to = access or from the" > + ."given list. " this is hard to parse, maybe reword? > + ."'free' means users can assign any tags." this one is worded differently than the rest (maybe): 'none' no tags are modifiable. 'list' tags from 'user-allow-list' are modifiable. 'existing' like list, but already existing tags of resource are also modifi= able. 'free' no tag restrictions. > + }, > + 'user-allow-list' =3D> { > + optional =3D> 1, > + type =3D> 'string', > + pattern =3D> "${PVE::JSONSchema::PVE_TAG_RE}(?:\;${PVE::JSONSchema::PVE= _TAG_RE})*", > + typetext =3D> "[;...]", > + description =3D> "List of tags users are allowed to set and delete (sem= icolon separated).", maybe add "for 'user-allow' values 'list' or 'existing'"? > + }, > +}; > + > my $datacenter_schema =3D { > type =3D> "object", > additionalProperties =3D> 0, > @@ -285,12 +311,66 @@ my $datacenter_schema =3D { > description =3D> "Tag style options.", > format =3D> $tag_style_format, > }, > + 'user-tag-access' =3D> { > + optional =3D> 1, > + type =3D> 'string', > + description =3D> "Privilege options for user settable tags", user-settable > + format =3D> $user_tag_privs_format, > + }, > + 'privileged-tags' =3D> { > + optional =3D> 1, > + type =3D> 'string', > + description =3D> "A list of tags that require a `Sys.Modify` on '/'= ) to set and delete. " > + ."Tags set here that are also in 'user-tag-access' also require `Sys.M= odify`.", > + pattern =3D> "(?:${PVE::JSONSchema::PVE_TAG_RE};)*${PVE::JSONSchema= ::PVE_TAG_RE}", > + typetext =3D> "[;...]", stray 'a' and ')' in first sentence. I am not sure the second sentence is necessary, or rather, wouldn't it be b= etter to make the two lists mutually exclusive? e.g., by removing privileged tags= from the other list? > + }, > }, > }; > =20 > # make schema accessible from outside (for documentation) > sub get_datacenter_schema { return $datacenter_schema }; > =20 > +# in scalar context, returns the list of allowed tags that exist > +# in list context, returns a tuple of allowed tags, privileged tags, and= if freeform is enabled > +# meh, this is a bit ugly, but okay > +# first parameter is a bool if the user is 'privileged' (normally Sys.Mo= dify on /) > +# second parameter is a closure which takes the vmid. should check if th= e user can see the vm tags > +sub get_allowed_tags { > + my ($privileged_user, $can_see_vm_tags) =3D @_; couldn't this live somewhere else instead of having this weird interface? e= .g., guest-common? it's not needed at all for parsing or writing the config, whi= ch is what lives here in this module/repo/package.. the other priv related helper for this already lives there as well.. > + > + my $dc =3D PVE::Cluster::cfs_read_file('datacenter.cfg'); > + > + my $allowed_tags =3D {}; > + my $privileged_tags =3D {}; > + if (my $tags =3D $dc->{'privileged-tags'}) { > + $privileged_tags->{$_} =3D 1 for $tags->@*; > + } > + my $user_tag_privs =3D $dc->{'user-tag-access'} // {}; > + my $user_allow =3D $user_tag_privs->{'user-allow'} // 'free'; > + my $freeform =3D $user_allow eq 'free'; > + > + if ($user_allow ne 'none' || $privileged_user) { > + $allowed_tags->{$_} =3D 1 for ($user_tag_privs->{'user-allow-list'} // [])->@*; > + } > + > + if ($user_allow eq 'free' || $user_allow eq 'existing' || $privilege= d_user) { > + my $props =3D PVE::Cluster::get_guest_config_properties(['tags']); > + for my $vmid (keys $props->%*) { > + next if !$privileged_user && !$can_see_vm_tags->($vmid); > + $allowed_tags->{$_} =3D 1 for PVE::Tools::split_list($props->{$vmid= }->{tags}); > + } > + } > + > + if ($privileged_user) { > + $allowed_tags->{$_} =3D 1 for keys $privileged_tags->%*; > + } else { > + delete $allowed_tags->{$_} for keys $privileged_tags->%*; > + } > + > + return wantarray ? ($allowed_tags, $privileged_tags, $freeform) : $a= llowed_tags; > +} > + > sub parse_datacenter_config { > my ($filename, $raw) =3D @_; > =20 > @@ -333,6 +413,19 @@ sub parse_datacenter_config { > $res->{'tag-style'} =3D parse_property_string($tag_style_format, $tag_s= tyle); > } > =20 > + if (my $user_tag_privs =3D $res->{'user-tag-access'}) { > + $res->{'user-tag-access'} =3D > + parse_property_string($user_tag_privs_format, $user_tag_privs); > + > + if (my $user_tags =3D $res->{'user-tag-access'}->{'user-allow-list'}) { > + $res->{'user-tag-access'}->{'user-allow-list'} =3D [split(';', $user_tags)]; could (warn and?) filter out privileged tags here) > + } > + } > + > + if (my $admin_tags =3D $res->{'privileged-tags'}) { > + $res->{'privileged-tags'} =3D [split(';', $admin_tags)]; > + } > + > # for backwards compatibility only, new migration property has prece= dence > if (defined($res->{migration_unsecure})) { > if (defined($res->{migration}->{type})) { > @@ -396,6 +489,18 @@ sub write_datacenter_config { > $cfg->{'tag-style'} =3D PVE::JSONSchema::print_property_string($tag_sty= le, $tag_style_format); > } > =20 > + if (ref(my $user_tag_privs =3D $cfg->{'user-tag-access'})) { > + if (my $user_tags =3D $user_tag_privs->{'user-allow-list'}) { > + $user_tag_privs->{'user-allow-list'} =3D join(';', sort $user_tags-= >@*); same here > + } > + $cfg->{'user-tag-access'} =3D > + PVE::JSONSchema::print_property_string($user_tag_privs, $user_tag_p= rivs_format); > + } > + > + if (ref(my $admin_tags =3D $cfg->{'privileged-tags'})) { > + $cfg->{'privileged-tags'} =3D join(';', sort $admin_tags->@*); > + } > + > my $comment =3D ''; > # add description as comment to top of file > my $description =3D $cfg->{description} || ''; > --=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