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 478D6C4E1 for ; Mon, 11 Apr 2022 09:09:24 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3B240BD0 for ; Mon, 11 Apr 2022 09:09:24 +0200 (CEST) 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 1B92FBC4 for ; Mon, 11 Apr 2022 09:09:23 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id CB7DD4097C for ; Mon, 11 Apr 2022 09:09:16 +0200 (CEST) From: Hannes Laimer To: pve-devel@lists.proxmox.com Date: Mon, 11 Apr 2022 07:09:09 +0000 Message-Id: <20220411070909.4779-1-h.laimer@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.037 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH pve-access-control] api2: ticket: don't require TFA if the only one is disabled 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: Mon, 11 Apr 2022 07:09:24 -0000 If TFA was added and disabled afterwards it was not possible to login again. Signed-off-by: Hannes Laimer --- This was reported on the forum. src/PVE/API2/AccessControl.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PVE/API2/AccessControl.pm b/src/PVE/API2/AccessControl.pm index 5d78c6f..8a272b4 100644 --- a/src/PVE/API2/AccessControl.pm +++ b/src/PVE/API2/AccessControl.pm @@ -172,12 +172,12 @@ my sub create_ticket_do : prototype($$$$$$) { my $ticket_data = $username; my $aad; if ($new_format) { - if (defined($tfa_info)) { + if (defined($tfa_info) && $tfa_info ne '{}') { $extra{NeedTFA} = 1; $ticket_data = "!tfa!$tfa_info"; $aad = $username; } - } elsif (defined($tfa_info)) { + } elsif (defined($tfa_info) && $tfa_info ne '{}') { $extra{NeedTFA} = 1; if ($tfa_info->{type} eq 'u2f') { my $u2finfo = $tfa_info->{data}; -- 2.30.2