From: Elias Huhsovitz <e.huhsovitz@proxmox.com>
To: pve-devel@lists.proxmox.com
Cc: Elias Huhsovitz <e.huhsovitz@proxmox.com>
Subject: [PATCH access-control v3 2/2] fix #6510: api: acl: allow deletion for non-existent entities
Date: Fri, 31 Jul 2026 11:43:16 +0200 [thread overview]
Message-ID: <20260731094316.46388-3-e.huhsovitz@proxmox.com> (raw)
In-Reply-To: <20260731094316.46388-1-e.huhsovitz@proxmox.com>
When a user, group, or API token is deleted, the system usually cleans
up the associated ACLs. However, edge cases like manual configuration
edits can leave orphaned ACL entries in the cluster configuration.
Currently, the `update_acl` API endpoint strictly validates the
existence of the target entity before processing any request. If the
entity is missing, the API throws an error (e.g., "user 'foo@pve' does
not exist") and aborts the operation. This prevents administrators from
cleaning up leftover ACLs through the API.
Bypass the existence check when the `delete` flag is set, to allow
removal of orphaned ACLs.
Signed-off-by: Elias Huhsovitz <e.huhsovitz@proxmox.com>
---
src/PVE/API2/ACL.pm | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/PVE/API2/ACL.pm b/src/PVE/API2/ACL.pm
index c57dd38..80de548 100644
--- a/src/PVE/API2/ACL.pm
+++ b/src/PVE/API2/ACL.pm
@@ -183,14 +183,14 @@ __PACKAGE__->register_method({
my $node = PVE::AccessControl::find_acl_tree_node($cfg->{acl_root}, $path);
foreach my $role (split_list($param->{roles})) {
+ my $role_privs = $cfg->{roles}->{$role};
die "role '$role' does not exist\n"
- if !$cfg->{roles}->{$role};
+ if !$role_privs && !$param->{delete};
# permissions() returns set privs as key, and propagate bit as value!
- if (!defined($auth_user_privs->{'Permissions.Modify'})) {
+ if (!defined($auth_user_privs->{'Permissions.Modify'}) && $role_privs) {
# 'perm-modify' allows /vms/* with VM.Allocate and similar restricted use cases
# filter those to only allow handing out a subset of currently active privs
- my $role_privs = $cfg->{roles}->{$role};
my $verb = $param->{delete} ? 'remove' : 'add';
foreach my $priv (keys $role_privs->%*) {
raise_param_exc(
@@ -224,7 +224,7 @@ __PACKAGE__->register_method({
foreach my $group (split_list($param->{groups})) {
die "group '$group' does not exist\n"
- if !$cfg->{groups}->{$group};
+ if !$param->{delete} && !$cfg->{groups}->{$group};
if ($param->{delete}) {
delete($node->{groups}->{$group}->{$role});
@@ -237,7 +237,7 @@ __PACKAGE__->register_method({
my $username = PVE::AccessControl::verify_username($userid);
die "user '$username' does not exist\n"
- if !$cfg->{users}->{$username};
+ if !$param->{delete} && !$cfg->{users}->{$username};
if ($param->{delete}) {
delete($node->{users}->{$username}->{$role});
@@ -248,7 +248,8 @@ __PACKAGE__->register_method({
foreach my $tokenid (split_list($param->{tokens})) {
my ($username, $token) = PVE::AccessControl::split_tokenid($tokenid);
- PVE::AccessControl::check_token_exist($cfg, $username, $token);
+ PVE::AccessControl::check_token_exist($cfg, $username, $token)
+ if !$param->{delete};
if ($param->{delete}) {
delete $node->{tokens}->{$tokenid}->{$role};
--
2.47.3
prev parent reply other threads:[~2026-07-31 9:43 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-31 9:43 [PATCH access-control v3 0/2] fix: #6510: Allow deleting ACLs for non-existent entities & add API tests Elias Huhsovitz
2026-07-31 9:43 ` [PATCH access-control v3 1/2] test: api: acl: add tests for modification endpoint Elias Huhsovitz
2026-07-31 9:43 ` Elias Huhsovitz [this message]
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=20260731094316.46388-3-e.huhsovitz@proxmox.com \
--to=e.huhsovitz@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.