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 B661C7D71B 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 B6586B00A for ; Tue, 9 Nov 2021 12:27:28 +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 11CD5AFA3 for ; Tue, 9 Nov 2021 12:27:26 +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 D96C8468FF for ; Tue, 9 Nov 2021 12:27:25 +0100 (CET) From: Wolfgang Bumiller To: pve-devel@lists.proxmox.com Date: Tue, 9 Nov 2021 12:27:04 +0100 Message-Id: <20211109112721.130935-16-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.533 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. [pveum.pm] Subject: [pve-devel] [PATCH access-control 09/10] pveum: update tfa delete command 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/CLI/pveum.pm | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/src/PVE/CLI/pveum.pm b/src/PVE/CLI/pveum.pm index 95b5705..44399b6 100755 --- a/src/PVE/CLI/pveum.pm +++ b/src/PVE/CLI/pveum.pm @@ -12,6 +12,7 @@ use PVE::API2::ACL; use PVE::API2::AccessControl; use PVE::API2::Domains; use PVE::API2::TFA; +use PVE::Cluster qw(cfs_read_file cfs_write_file); use PVE::CLIFormatter; use PVE::CLIHandler; use PVE::JSONSchema qw(get_standard_option); @@ -111,6 +112,43 @@ __PACKAGE__->register_method({ return PVE::API2::AccessControl->permissions($param); }}); +__PACKAGE__->register_method({ + name => 'delete_tfa', + path => 'delete_tfa', + method => 'PUT', + description => 'Delete TFA entries from a user.', + parameters => { + additionalProperties => 0, + properties => { + userid => get_standard_option('userid'), + id => { + description => "The TFA ID, if none provided, all TFA entries will be deleted.", + type => 'string', + optional => 1, + }, + }, + }, + returns => { type => 'null' }, + code => sub { + my ($param) = @_; + + my $userid = extract_param($param, "userid"); + my $tfa_id = extract_param($param, "id"); + + PVE::AccessControl::assert_new_tfa_config_available(); + + PVE::AccessControl::lock_tfa_config(sub { + my $tfa_cfg = cfs_read_file('priv/tfa.cfg'); + if (defined($tfa_id)) { + $tfa_cfg->api_delete_tfa($userid, $tfa_id); + } else { + $tfa_cfg->remove_user($userid); + } + cfs_write_file('priv/tfa.cfg', $tfa_cfg); + }); + return; + }}); + our $cmddef = { user => { add => [ 'PVE::API2::User', 'create_user', ['userid'] ], @@ -119,7 +157,7 @@ our $cmddef = { list => [ 'PVE::API2::User', 'index', [], {}, $print_api_result, $PVE::RESTHandler::standard_output_options], permissions => [ 'PVE::API2::AccessControl', 'permissions', ['userid'], {}, $print_perm_result, $PVE::RESTHandler::standard_output_options], tfa => { - delete => [ 'PVE::API2::TFA', 'change_tfa', ['userid'], { action => 'delete', key => undef, config => undef, response => undef, }, ], + delete => [ __PACKAGE__, 'delete_tfa', ['userid'] ], }, token => { add => [ 'PVE::API2::User', 'generate_token', ['userid', 'tokenid'], {}, $print_api_result, $PVE::RESTHandler::standard_output_options ], -- 2.30.2