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)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 5F157837AC for ; Mon, 6 Dec 2021 09:38:03 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 555211BA70 for ; Mon, 6 Dec 2021 09:38:03 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id E7B9C1BA67 for ; Mon, 6 Dec 2021 09:38:01 +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 B039B44724 for ; Mon, 6 Dec 2021 09:38:01 +0100 (CET) From: Wolfgang Bumiller To: pve-devel@lists.proxmox.com Date: Mon, 6 Dec 2021 09:38:01 +0100 Message-Id: <20211206083801.18134-2-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206083801.18134-1-w.bumiller@proxmox.com> References: <20211206083801.18134-1-w.bumiller@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.428 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 Subject: [pve-devel] [PATCH access-control 2/2] fix #3768: warn on bad u2f or webauthn settings 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, 06 Dec 2021 08:38:03 -0000 but don't bail out of the entire auth process, otherwise not even totp or recovery keys will work anymore in this case Signed-off-by: Wolfgang Bumiller --- src/PVE/AccessControl.pm | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/src/PVE/AccessControl.pm b/src/PVE/AccessControl.pm index 51a96a3..1306576 100644 --- a/src/PVE/AccessControl.pm +++ b/src/PVE/AccessControl.pm @@ -895,17 +895,23 @@ sub configure_u2f_and_wa : prototype($) { my $dc = cfs_read_file('datacenter.cfg'); if (my $u2f = $dc->{u2f}) { - $tfa_cfg->set_u2f_config({ - origin => $u2f->{origin} // $get_origin->(), - appid => $u2f->{appid}, - }); + eval { + $tfa_cfg->set_u2f_config({ + origin => $u2f->{origin} // $get_origin->(), + appid => $u2f->{appid}, + }); + }; + warn "u2f unavailable, configuration error: $@\n" if $@; } if (my $wa = $dc->{webauthn}) { - $tfa_cfg->set_webauthn_config({ - origin => $wa->{origin} // $get_origin->(), - rp => $wa->{rp}, - id => $wa->{id}, - }); + eval { + $tfa_cfg->set_webauthn_config({ + origin => $wa->{origin} // $get_origin->(), + rp => $wa->{rp}, + id => $wa->{id}, + }); + }; + warn "webauthn unavailable, configuration error: $@\n" if $@; } } -- 2.30.2