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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 9E51572B52 for ; Wed, 16 Jun 2021 14:17:12 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8CE2E114A5 for ; Wed, 16 Jun 2021 14:17:12 +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 6080D11499 for ; Wed, 16 Jun 2021 14:17:11 +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 2A8D942AE2 for ; Wed, 16 Jun 2021 14:17:11 +0200 (CEST) From: Lorenz Stechauner To: pve-devel@lists.proxmox.com Date: Wed, 16 Jun 2021 14:16:46 +0200 Message-Id: <20210616121646.79435-1-l.stechauner@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.813 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. [pve6to7.pm] Subject: [pve-devel] [PATCH v2 manager] pve6to7: add check for pool permissions 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: Wed, 16 Jun 2021 12:17:12 -0000 the two checks make sure that: * no user defined role 'PVEPoolUser' exists * the user gets a hint for roles only containing Pool.Allocate and not Pool.Audit Signed-off-by: Lorenz Stechauner --- changes to v1: * rebased on master PVE/CLI/pve6to7.pm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/PVE/CLI/pve6to7.pm b/PVE/CLI/pve6to7.pm index 90f92a55..b391d006 100644 --- a/PVE/CLI/pve6to7.pm +++ b/PVE/CLI/pve6to7.pm @@ -9,6 +9,7 @@ use PVE::API2::LXC; use PVE::API2::Qemu; use PVE::API2::Certificates; +use PVE::AccessControl; use PVE::Ceph::Tools; use PVE::Cluster; use PVE::Corosync; @@ -693,6 +694,30 @@ sub check_misc { check_backup_retention_settings(); check_cifs_credential_location(); + + log_info("Check custom roles"); + my $usercfg = PVE::Cluster::cfs_read_file("user.cfg"); + foreach my $role (sort keys %{$usercfg->{roles}}) { + if (PVE::AccessControl::role_is_special($role)) { + next; + } + + if ($role eq "PVEPoolUser") { + # the user created a custom role named PVEPoolUser + log_fail("Custom role '$role' has a restricted name - a built-in role 'PVEPoolUser' will be available with the upgrade"); + } else { + log_pass("Custom role '$role' has no restricted name"); + } + + my $perms = $usercfg->{roles}->{$role}; + if ($perms->{'Pool.Allocate'} && $perms->{'Pool.Audit'}) { + log_pass("Custom role '$role' contains updated pool permissions"); + } elsif ($perms->{'Pool.Allocate'}) { + log_warn("Custom role '$role' contains permission 'Pool.Allocate' - to ensure same behavior add 'Pool.Audit' to this role after the upgrade"); + } else { + log_pass("Custom role '$role' contains no permissions that need to be updated"); + } + } } __PACKAGE__->register_method ({ -- 2.20.1