From d168ab34d64f5c7deaf8a5686594fe4b0467dcd7 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Tue, 9 Nov 2021 12:27:03 +0100 Subject: [PATCH] update tfa cleanup when deleting users Signed-off-by: Wolfgang Bumiller --- src/PVE/API2/User.pm | 2 +- src/PVE/AccessControl.pm | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/PVE/API2/User.pm b/src/PVE/API2/User.pm index 3d4d4e0..244264e 100644 --- a/src/PVE/API2/User.pm +++ b/src/PVE/API2/User.pm @@ -453,7 +453,7 @@ __PACKAGE__->register_method ({ my $partial_deletion = ''; eval { - PVE::AccessControl::user_set_tfa($userid, $realm, undef, undef, $usercfg, $domain_cfg); + PVE::AccessControl::user_remove_tfa($userid); $partial_deletion = ' - but deleted related TFA'; PVE::AccessControl::delete_user_group($userid, $usercfg); diff --git a/src/PVE/AccessControl.pm b/src/PVE/AccessControl.pm index cd46507..0b00847 100644 --- a/src/PVE/AccessControl.pm +++ b/src/PVE/AccessControl.pm @@ -1740,6 +1740,16 @@ sub assert_new_tfa_config_available() { # FIXME: Assert cluster-wide new-tfa-config support! } +sub user_remove_tfa : prototype($) { + my ($userid) = @_; + + assert_new_tfa_config_available(); + + my $tfa_cfg = cfs_read_file('priv/tfa.cfg'); + $tfa_cfg->remove_user($userid); + cfs_write_file('priv/tfa.cfg', $tfa_cfg); +} + sub user_get_tfa : prototype($$$) { my ($username, $realm, $new_format) = @_; -- 2.39.2