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 E6F4589DCC for ; Tue, 18 Oct 2022 16:03:00 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A180529621 for ; Tue, 18 Oct 2022 16:02:30 +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 ; Tue, 18 Oct 2022 16:02:28 +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 EC86844A8A for ; Tue, 18 Oct 2022 16:02:27 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Tue, 18 Oct 2022 16:02:10 +0200 Message-Id: <20221018140226.598710-5-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221018140226.598710-1-d.csapak@proxmox.com> References: <20221018140226.598710-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.068 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [datacenterconfig.pm] Subject: [pve-devel] [PATCH cluster v8 4/4] DataCenterConfig: 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, 18 Oct 2022 14:03:01 -0000 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 '/') also add a helper 'get_user_admin_tags' that returns two hashmaps that determines the allowed user tags and admin tags that require elevated permissions Signed-off-by: Dominik Csapak --- data/PVE/DataCenterConfig.pm | 93 ++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/data/PVE/DataCenterConfig.pm b/data/PVE/DataCenterConfig.pm index bb29d26..e2140ff 100644 --- a/data/PVE/DataCenterConfig.pm +++ b/data/PVE/DataCenterConfig.pm @@ -154,6 +154,26 @@ my $tag_style_format = { }, }; +my $user_tag_privs_format = { + 'usable' => { + optional => 1, + type => 'string', + enum => ['none', 'list', 'existing', 'free'], + default => 'free', + dscription => "Determines which tags a user without Sys.Modify on '/' can set and delete. ". + "'none' means no tags are settable.'list' allows tags from the given list. ". + "'existing' means only already existing tags or from the given list. ". + "And 'free' means users can assign any tags." + }, + 'list' => { + optional => 1, + type => 'string', + pattern => "${PVE::JSONSchema::PVE_TAG_RE}(?:\;${PVE::JSONSchema::PVE_TAG_RE})*", + typetext => "[;=...]", + description => "List of tags users are allowd to set and delete (semicolon separated).", + }, +}; + my $datacenter_schema = { type => "object", additionalProperties => 0, @@ -285,12 +305,60 @@ my $datacenter_schema = { description => "Tag style options.", format => $tag_style_format, }, + 'user-tag-privileges' => { + optional => 1, + type => 'string', + description => "Privilege options for user settable tags", + format => $user_tag_privs_format, + }, + 'admin-tags' => { + optional => 1, + type => 'string', + description => "A list of tags only admins (Sys.Modify on '/') are allowed to set/delete", + pattern => "(?:${PVE::JSONSchema::PVE_TAG_RE};)*${PVE::JSONSchema::PVE_TAG_RE}", + }, }, }; # make schema accessible from outside (for documentation) sub get_datacenter_schema { return $datacenter_schema }; +# returns two hashmaps of tags, the first is the list of tags that can +# be used by users with 'VM.Config.Options', and the second is a list +# that needs 'Sys.Modify' on '/' +# +# If the first map is 'undef', it means there is generally no restriction +# besides the tags defined in the second map. +# +# CAUTION: this function may include tags from *all* guest configs, +# regardless of the current authuser +sub get_user_admin_tags { + my $user_tags = {}; + my $admin_tags = {}; + + my $dc = PVE::Cluster::cfs_read_file('datacenter.cfg'); + if (my $user_tag_privs = $dc->{'user-tag-privileges'}) { + my $usable = $user_tag_privs->{usable} // 'free'; + if ($usable eq 'free') { + $user_tags = undef; + } elsif ($usable eq 'existing') { + map { $user_tags->{$_} = 1 } ($user_tag_privs->{list} // [])->@*; + my $props = PVE::Cluster::get_guest_config_properties(['tags']); + for my $vmid (keys $props->%*) { + map { $user_tags->{$_} = 1 } PVE::Tools::split_list($props->{$vmid}->{tags}); + } + } elsif ($usable eq 'list') { + map { $user_tags->{$_} = 1 } ($user_tag_privs->{list} // [])->@*; + } + } + if (my $tags = $dc->{'admin-tags'}) { + $admin_tags = {}; + map { $admin_tags->{$_} = 1 } $tags->@*; + } + + return ($user_tags, $admin_tags); +} + sub parse_datacenter_config { my ($filename, $raw) = @_; @@ -333,6 +401,19 @@ sub parse_datacenter_config { $res->{'tag-style'} = parse_property_string($tag_style_format, $tag_style); } + if (my $user_tag_privs = $res->{'user-tag-privileges'}) { + $res->{'user-tag-privileges'} = + parse_property_string($user_tag_privs_format, $user_tag_privs); + + if (my $user_tags = $res->{'user-tag-privileges'}->{list}) { + $res->{'user-tag-privileges'}->{list} = [split(';', $user_tags)]; + } + } + + if (my $admin_tags = $res->{'admin-tags'}) { + $res->{'admin-tags'} = [split(';', $admin_tags)]; + } + # for backwards compatibility only, new migration property has precedence if (defined($res->{migration_unsecure})) { if (defined($res->{migration}->{type})) { @@ -396,6 +477,18 @@ sub write_datacenter_config { $cfg->{'tag-style'} = PVE::JSONSchema::print_property_string($tag_style, $tag_style_format); } + if (ref(my $user_tag_privs = $cfg->{'user-tag-privileges'})) { + if (my $user_tags = $user_tag_privs->{list}) { + $user_tag_privs->{list} = join(';', sort ($user_tags)); + } + $cfg->{'user-tag-privileges'} = + PVE::JSONSchema::print_property_string($user_tag_privs, $user_tag_privs_format); + } + + if (ref(my $admin_tags = $cfg->{'admin-tags'})) { + $cfg->{'admin-tags'} = join(';', sort $admin_tags->@*); + } + my $comment = ''; # add description as comment to top of file my $description = $cfg->{description} || ''; -- 2.30.2