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 57AB19AFF2 for ; Mon, 20 Nov 2023 08:23:26 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 38A07148BF for ; Mon, 20 Nov 2023 08:22:56 +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 ; Mon, 20 Nov 2023 08:22:55 +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 7805A43315 for ; Mon, 20 Nov 2023 08:22:55 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Mon, 20 Nov 2023 08:22:40 +0100 Message-Id: <20231120072242.75599-3-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231120072242.75599-1-f.gruenbichler@proxmox.com> References: <20231120072242.75599-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.065 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH access-control 2/2] pools: record parent/subpool information 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: Mon, 20 Nov 2023 07:23:26 -0000 and ensure a missing intermediate pool exists at all times. Signed-off-by: Fabian Grünbichler --- Notes: v1: adapt RE based on Wolfgang's feedback, post-if style a "missing link" should never happen when modifying via the API (both deletion with children and addition without the parent existing is blocked there), but it could happen when manually editing the config. src/PVE/AccessControl.pm | 16 +++++++++++++++- src/test/parser_writer.pl | 4 ++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/PVE/AccessControl.pm b/src/PVE/AccessControl.pm index 4e3b077..461a64e 100644 --- a/src/PVE/AccessControl.pm +++ b/src/PVE/AccessControl.pm @@ -1529,7 +1529,21 @@ sub parse_user_config { } # make sure to add the pool (even if there are no members) - $cfg->{pools}->{$pool} = { vms => {}, storage => {} } if !$cfg->{pools}->{$pool}; + $cfg->{pools}->{$pool} = { vms => {}, storage => {}, pools => {} } + if !$cfg->{pools}->{$pool}; + + if ($pool =~ m!/!) { + my $curr = $pool; + while ($curr =~ m!^(.+)/[^/]+$!) { + # ensure nested pool info is correctly recorded + my $parent = $1; + $cfg->{pools}->{$curr}->{parent} = $parent; + $cfg->{pools}->{$parent} = { vms => {}, storage => {}, pools => {} } + if !$cfg->{pools}->{$parent}; + $cfg->{pools}->{$parent}->{pools}->{$curr} = 1; + $curr = $parent; + } + } $cfg->{pools}->{$pool}->{comment} = PVE::Tools::decode_text($comment) if $comment; diff --git a/src/test/parser_writer.pl b/src/test/parser_writer.pl index 65a70eb..80c346b 100755 --- a/src/test/parser_writer.pl +++ b/src/test/parser_writer.pl @@ -237,21 +237,25 @@ my $default_cfg = { 'id' => 'testpool', vms => {}, storage => {}, + pools => {}, }, test_pool_members => { 'id' => 'testpool', vms => { 123 => 1, 1234 => 1}, storage => { 'local' => 1, 'local-zfs' => 1}, + pools => {}, }, test_pool_duplicate_vms => { 'id' => 'test_duplicate_vms', vms => {}, storage => {}, + pools => {}, }, test_pool_duplicate_storages => { 'id' => 'test_duplicate_storages', vms => {}, storage => { 'local' => 1, 'local-zfs' => 1}, + pools => {}, }, acl_simple_user => { 'path' => '/', -- 2.39.2