From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager 1/2] pve7to8: refactor user.cfg loop
Date: Tue, 13 Jun 2023 13:50:23 +0200 [thread overview]
Message-ID: <20230613115024.1884317-1-f.gruenbichler@proxmox.com> (raw)
next patch adds acl-related checks
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
PVE/CLI/pve7to8.pm | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/PVE/CLI/pve7to8.pm b/PVE/CLI/pve7to8.pm
index 6b51e98eb..7dc66499a 100644
--- a/PVE/CLI/pve7to8.pm
+++ b/PVE/CLI/pve7to8.pm
@@ -720,17 +720,17 @@ sub check_custom_pool_roles {
}
my $et = shift @data;
- next if $et ne 'role';
-
- my ($role, $privlist) = @data;
- if (!PVE::AccessControl::verify_rolename($role, 1)) {
- warn "user config - ignore role '$role' - invalid characters in role name\n";
- next;
- }
+ if ($et eq 'role') {
+ my ($role, $privlist) = @data;
+ if (!PVE::AccessControl::verify_rolename($role, 1)) {
+ warn "user config - ignore role '$role' - invalid characters in role name\n";
+ next;
+ }
- $roles->{$role} = {} if !$roles->{$role};
- foreach my $priv (split_list($privlist)) {
- $roles->{$role}->{$priv} = 1;
+ $roles->{$role} = {} if !$roles->{$role};
+ foreach my $priv (split_list($privlist)) {
+ $roles->{$role}->{$priv} = 1;
+ }
}
}
--
2.39.2
next reply other threads:[~2023-06-13 11:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-13 11:50 Fabian Grünbichler [this message]
2023-06-13 11:50 ` [pve-devel] [PATCH manager 2/2] pve7to8: add check for dropped Permissions.Modify Fabian Grünbichler
2023-06-16 12:39 ` [pve-devel] applied-series: [PATCH manager 1/2] pve7to8: refactor user.cfg loop 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=20230613115024.1884317-1-f.gruenbichler@proxmox.com \
--to=f.gruenbichler@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