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 AEAA37D715 for ; Tue, 9 Nov 2021 12:27:53 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9DB77AF86 for ; Tue, 9 Nov 2021 12:27:25 +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 95939AF5E for ; Tue, 9 Nov 2021 12:27:24 +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 6F02D42CF2 for ; Tue, 9 Nov 2021 12:27:24 +0100 (CET) From: Wolfgang Bumiller To: pve-devel@lists.proxmox.com Date: Tue, 9 Nov 2021 12:27:03 +0100 Message-Id: <20211109112721.130935-15-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211109112721.130935-1-w.bumiller@proxmox.com> References: <20211109112721.130935-1-w.bumiller@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.556 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [user.pm, accesscontrol.pm] Subject: [pve-devel] [PATCH access-control 08/10] update tfa cleanup when deleting users 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: Tue, 09 Nov 2021 11:27:53 -0000 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.30.2