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 126799A117 for ; Fri, 17 Nov 2023 11:00:48 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E960C1F561 for ; Fri, 17 Nov 2023 11:00:47 +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 ; Fri, 17 Nov 2023 11:00:47 +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 F3C8843D50 for ; Fri, 17 Nov 2023 11:00:46 +0100 (CET) Date: Fri, 17 Nov 2023 11:00:46 +0100 From: Wolfgang Bumiller To: Fabian =?utf-8?Q?Gr=C3=BCnbichler?= Cc: pve-devel@lists.proxmox.com Message-ID: References: <20231116153128.788593-1-f.gruenbichler@proxmox.com> <20231116153128.788593-2-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20231116153128.788593-2-f.gruenbichler@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.101 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 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [accesscontrol.pm, perm-test6.pl] Subject: Re: [pve-devel] [PATCH access-control 1/2] allow up to three levels of pool nesting 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: Fri, 17 Nov 2023 10:00:48 -0000 On Thu, Nov 16, 2023 at 04:31:25PM +0100, Fabian Grünbichler wrote: > with ACLs being inherited along the pool hierarchy. > > Signed-off-by: Fabian Grünbichler > --- > src/PVE/AccessControl.pm | 10 ++++++++-- > src/test/perm-test6.pl | 16 ++++++++++++++++ > src/test/test6.cfg | 5 +++++ > 3 files changed, 29 insertions(+), 2 deletions(-) > > diff --git a/src/PVE/AccessControl.pm b/src/PVE/AccessControl.pm > index 9600e59..d9ae611 100644 > --- a/src/PVE/AccessControl.pm > +++ b/src/PVE/AccessControl.pm > @@ -1264,7 +1264,7 @@ sub check_path { > |/nodes > |/nodes/[[:alnum:]\.\-\_]+ > |/pool > - |/pool/[[:alnum:]\.\-\_]+ > + |/pool/(:?[[:alnum:]\.\-\_]+\/?)+ Should we incorporate the 3 level limit here? eg. [chars]+(?:/[chars]+){0,2} Although regex would differ from the one used below (although it could use the same with only the `{0,2}` bit removed...). > |/sdn > |/sdn/controllers > |/sdn/controllers/[[:alnum:]\_\-]+