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 66D8574C8B for ; Thu, 2 Jun 2022 09:25:06 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6521427473 for ; Thu, 2 Jun 2022 09:25:06 +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 id BF08B27436 for ; Thu, 2 Jun 2022 09:25:04 +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 8BE724349C for ; Thu, 2 Jun 2022 09:25:04 +0200 (CEST) From: Oguz Bektas To: pve-devel@lists.proxmox.com Date: Thu, 2 Jun 2022 09:24:35 +0200 Message-Id: <20220602072450.55209-4-o.bektas@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220602072450.55209-1-o.bektas@proxmox.com> References: <20220602072450.55209-1-o.bektas@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.494 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 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. [acl.pm] Subject: [pve-devel] [PATCH v4 access-control 03/18] api: acl: only allow granting SU privilege if user already has it 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: Thu, 02 Jun 2022 07:25:06 -0000 also check for 'propagate' bit on the target path to verify if the user can grant SU privileges on there. Co-authored-by: Fabian Grünbichler Signed-off-by: Oguz Bektas --- src/PVE/API2/ACL.pm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/PVE/API2/ACL.pm b/src/PVE/API2/ACL.pm index 857c672..f8d4914 100644 --- a/src/PVE/API2/ACL.pm +++ b/src/PVE/API2/ACL.pm @@ -134,6 +134,10 @@ __PACKAGE__->register_method ({ code => sub { my ($param) = @_; + my $rpcenv = PVE::RPCEnvironment::get(); + my $authuser = $rpcenv->get_user(); + my $is_superuser = $rpcenv->check($authuser, $param->{path}, ['SuperUser'], 1); + if (!($param->{users} || $param->{groups} || $param->{tokens})) { raise_param_exc({ map { $_ => "either 'users', 'groups' or 'tokens' is required." } qw(users groups tokens) }); } @@ -160,6 +164,18 @@ __PACKAGE__->register_method ({ die "role '$role' does not exist\n" if !$cfg->{roles}->{$role}; + my $role_privs = $cfg->{roles}->{$role}; + my $role_contains_superuser = grep { $_ eq 'SuperUser' } keys %$role_privs; + if ($role_contains_superuser) { + die "only superusers can grant/remove this role!\n" + if !$is_superuser; + + my $user_perms = $rpcenv->permissions($authuser, $param->{path}); + my $has_propagate = $user_perms->{SuperUser}; # check if user has SU with propagate bit on the target path + die "cannot grant SU on '$param->{path}' without having 'propagate' bit!\n" + if !$has_propagate; + } + foreach my $group (split_list($param->{groups})) { die "group '$group' does not exist\n" -- 2.30.2