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 4FAD891C2C for ; Fri, 23 Dec 2022 14:10:48 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3915125DC1 for ; Fri, 23 Dec 2022 14:10:48 +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, 23 Dec 2022 14:10: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 6BAAF44023 for ; Fri, 23 Dec 2022 14:10:47 +0100 (CET) From: Markus Frank To: pve-devel@lists.proxmox.com Date: Fri, 23 Dec 2022 14:10:03 +0100 Message-Id: <20221223131007.130310-3-m.frank@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221223131007.130310-1-m.frank@proxmox.com> References: <20221223131007.130310-1-m.frank@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.039 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. [accesscontrol.pm, rpcenvironment.pm] Subject: [pve-devel] [PATCH access-control v2 2/6] added acls for Shared Filesystem Directories 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, 23 Dec 2022 13:10:48 -0000 Signed-off-by: Markus Frank --- src/PVE/AccessControl.pm | 2 ++ src/PVE/RPCEnvironment.pm | 12 +++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/PVE/AccessControl.pm b/src/PVE/AccessControl.pm index a95d072..742304c 100644 --- a/src/PVE/AccessControl.pm +++ b/src/PVE/AccessControl.pm @@ -1221,6 +1221,8 @@ sub check_path { |/storage/[[:alnum:]\.\-\_]+ |/vms |/vms/[1-9][0-9]{2,} + |/dirs + |/dirs/[[:alnum:]\.\-\_]+ )$!xs; } diff --git a/src/PVE/RPCEnvironment.pm b/src/PVE/RPCEnvironment.pm index 0ee2346..f8bbc56 100644 --- a/src/PVE/RPCEnvironment.pm +++ b/src/PVE/RPCEnvironment.pm @@ -187,10 +187,11 @@ sub compute_api_permission { nodes => qr/Sys\.|Permissions\.Modify/, sdn => qr/SDN\.|Permissions\.Modify/, dc => qr/Sys\.Audit|SDN\./, + dirs => qr/Sys\.|Permissions\.Modify/, }; map { $res->{$_} = {} } keys %$priv_re_map; - my $required_paths = ['/', '/nodes', '/access/groups', '/vms', '/storage', '/sdn']; + my $required_paths = ['/', '/nodes', '/access/groups', '/vms', '/storage', '/sdn', '/dirs']; my $checked_paths = {}; foreach my $path (@$required_paths, keys %{$usercfg->{acl}}) { @@ -240,6 +241,7 @@ sub get_effective_permissions { '/sdn' => 1, '/storage' => 1, '/vms' => 1, + '/dirs' => 1, }; my $cfg = $self->{user_cfg}; @@ -355,6 +357,14 @@ sub check_vm_perm { return $self->check_full($user, "/vms/$vmid", $privs, $any, $noerr); }; +sub check_dir_perm { + my ($self, $user, $dirid, $privs, $any, $noerr) = @_; + + my $cfg = $self->{user_cfg}; + + return $self->check_full($user, "/dirs/$dirid", $privs, $any, $noerr); +}; + sub is_group_member { my ($self, $group, $user) = @_; -- 2.30.2