public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
* [pve-devel] SPAM: [PATCH pve-access-control 0/1] Fixed user removing failure
@ 2021-10-19 18:49 Jasper Yu
  2021-10-19 18:49 ` [pve-devel] SPAM: [PATCH container 1/1] Fixed #3686: User Removing Failure Jasper Yu
  0 siblings, 1 reply; 2+ messages in thread
From: Jasper Yu @ 2021-10-19 18:49 UTC (permalink / raw)
  To: pve-devel

From: Li-Heng Yu <007seadog@gmail.com>

Since PVE 7.0, people can't remove user either in Web GUI or CLI, this
PR fix the issue by having one more condition check when deleting user.

Li-Heng Yu (1):
  Fixed #3686: User Removing Failure

 src/PVE/AccessControl.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

-- 
2.28.0




^ permalink raw reply	[flat|nested] 2+ messages in thread

* [pve-devel] SPAM: [PATCH container 1/1] Fixed #3686: User Removing Failure
  2021-10-19 18:49 [pve-devel] SPAM: [PATCH pve-access-control 0/1] Fixed user removing failure Jasper Yu
@ 2021-10-19 18:49 ` Jasper Yu
  0 siblings, 0 replies; 2+ messages in thread
From: Jasper Yu @ 2021-10-19 18:49 UTC (permalink / raw)
  To: pve-devel

Signed-off-by: Li-Heng Yu <007seadog@gmail.com>
---
 src/PVE/AccessControl.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/PVE/AccessControl.pm b/src/PVE/AccessControl.pm
index fcb16bd..0d2c6c0 100644
--- a/src/PVE/AccessControl.pm
+++ b/src/PVE/AccessControl.pm
@@ -1628,7 +1628,10 @@ sub user_set_tfa {
 	    die "realm '$realm' does not allow removing the 2nd factor\n" if defined($user);
 	}
     } else {
-	die "user '$userid' not found\n" if !defined($user);
+        # Remove user in non-TFA-enforcement realm
+        if (defined($data)) {
+            die "user '$userid' not found\n" if !defined($user);
+        }
 	# Without a realm-enforced TFA setting the user can add a u2f or totp entry by themselves.
 	# The 'yubico' type requires yubico server settings, which have to be configured on the
 	# realm, so this is not supported here:
-- 
2.28.0




^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-10-20 16:05 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-19 18:49 [pve-devel] SPAM: [PATCH pve-access-control 0/1] Fixed user removing failure Jasper Yu
2021-10-19 18:49 ` [pve-devel] SPAM: [PATCH container 1/1] Fixed #3686: User Removing Failure Jasper Yu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal