From: Wolfgang Bumiller <w.bumiller@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH access-control 2/2] fix #3768: warn on bad u2f or webauthn settings
Date: Mon, 6 Dec 2021 09:38:01 +0100 [thread overview]
Message-ID: <20211206083801.18134-2-w.bumiller@proxmox.com> (raw)
In-Reply-To: <20211206083801.18134-1-w.bumiller@proxmox.com>
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 <w.bumiller@proxmox.com>
---
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
next prev parent reply other threads:[~2021-12-06 8:38 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-06 8:38 [pve-devel] [PATCH access-control 1/2] fix a 'use of undefined...' warning Wolfgang Bumiller
2021-12-06 8:38 ` Wolfgang Bumiller [this message]
2021-12-06 12:56 ` [pve-devel] applied: [PATCH access-control 2/2] fix #3768: warn on bad u2f or webauthn settings Thomas Lamprecht
2021-12-06 12:56 ` [pve-devel] applied: [PATCH access-control 1/2] fix a 'use of undefined...' warning Thomas Lamprecht
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=20211206083801.18134-2-w.bumiller@proxmox.com \
--to=w.bumiller@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox