From: Lorenz Stechauner <l.stechauner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v2 manager] pve6to7: add check for pool permissions
Date: Wed, 16 Jun 2021 14:16:46 +0200 [thread overview]
Message-ID: <20210616121646.79435-1-l.stechauner@proxmox.com> (raw)
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 <l.stechauner@proxmox.com>
---
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
next reply other threads:[~2021-06-16 12:17 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-16 12:16 Lorenz Stechauner [this message]
2021-06-16 12:45 ` Fabian Grünbichler
2021-06-16 12:49 ` Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210616121646.79435-1-l.stechauner@proxmox.com \
--to=l.stechauner@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox