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 96C497C4AD for ; Fri, 5 Nov 2021 07:27:04 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 836AF2743B for ; Fri, 5 Nov 2021 07:26:34 +0100 (CET) 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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id C89CF2742A for ; Fri, 5 Nov 2021 07:26:32 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 93E1345BF1; Fri, 5 Nov 2021 07:26:32 +0100 (CET) Message-ID: <6f2414f4-4e0f-fe8d-d4e6-fc8c202a32e0@proxmox.com> Date: Fri, 5 Nov 2021 07:26:31 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:94.0) Gecko/20100101 Thunderbird/94.0 Content-Language: en-US To: Proxmox VE development discussion , Jasper Yu <007seadog@gmail.com> References: <20211019185023.65276-1-007seadog@gmail.com> <20211019185023.65276-2-007seadog@gmail.com> From: Thomas Lamprecht In-Reply-To: <20211019185023.65276-2-007seadog@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 1.212 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 NICE_REPLY_A -2.093 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pve-devel] SPAM: [PATCH pve-access-control 1/1] Fixed #3686: User Removing Failure 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: Fri, 05 Nov 2021 06:27:04 -0000 On 19.10.21 20:50, Jasper Yu wrote: > From: Li-Heng Yu <007seadog@gmail.com> > > 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: > just for the record, it seems Dominik beat you to it by a few hours, same approach different syntax: https://lists.proxmox.com/pipermail/pve-devel/2021-October/050443.html Thanks for your contribution effort nonetheless though!