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 9B31860148 for ; Wed, 2 Dec 2020 10:21:15 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 902B519061 for ; Wed, 2 Dec 2020 10:21:15 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id CFC8B1903F for ; Wed, 2 Dec 2020 10:21:14 +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 97B4D448B3 for ; Wed, 2 Dec 2020 10:21:14 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Wed, 2 Dec 2020 10:21:05 +0100 Message-Id: <20201202092113.15911-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201202092113.15911-1-d.csapak@proxmox.com> References: <20201202092113.15911-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.304 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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. [config.pm] Subject: [pve-devel] [PATCH storage 1/1] api: storage/config: use extract_sensitive_params from tools 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: Wed, 02 Dec 2020 09:21:15 -0000 we have a more general version there Signed-off-by: Dominik Csapak --- PVE/API2/Storage/Config.pm | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/PVE/API2/Storage/Config.pm b/PVE/API2/Storage/Config.pm index 6e23427..00abd13 100755 --- a/PVE/API2/Storage/Config.pm +++ b/PVE/API2/Storage/Config.pm @@ -4,7 +4,7 @@ use strict; use warnings; use PVE::SafeSyslog; -use PVE::Tools qw(extract_param); +use PVE::Tools qw(extract_param extract_sensitive_params); use PVE::Cluster qw(cfs_read_file cfs_write_file); use PVE::Storage; use PVE::Storage::Plugin; @@ -112,28 +112,7 @@ __PACKAGE__->register_method ({ return &$api_storage_config($cfg, $param->{storage}); }}); -my sub extract_sensitive_params :prototype($$) { - my ($param, $delete_list) = @_; - - my $sensitive; - - my %delete = map { $_ => 1 } ($delete_list || [])->@*; - - # always extract pw and keys, so they don't get written to the www-data readable scfg - for my $opt (qw(password encryption-key)) { - # First handle deletions as explicitly setting `undef`, afterwards new values may override - # it. - if (exists($delete{$opt})) { - $sensitive->{$opt} = undef; - } - - if (defined(my $value = extract_param($param, $opt))) { - $sensitive->{$opt} = $value; - } - } - - return $sensitive; -} +my $sensitive_params = [qw(password encryption-key)]; __PACKAGE__->register_method ({ name => 'create', @@ -182,7 +161,7 @@ __PACKAGE__->register_method ({ # fix me in section config create never need an empty entity. delete $param->{nodes} if !$param->{nodes}; - my $sensitive = extract_sensitive_params($param, []); + my $sensitive = extract_sensitive_params($param, $sensitive_params, []); my $plugin = PVE::Storage::Plugin->lookup($type); my $opts = $plugin->check_config($storeid, $param, 1, 1); @@ -282,7 +261,7 @@ __PACKAGE__->register_method ({ my $scfg = PVE::Storage::storage_config($cfg, $storeid); $type = $scfg->{type}; - my $sensitive = extract_sensitive_params($param, $delete); + my $sensitive = extract_sensitive_params($param, $sensitive_params, $delete); my $plugin = PVE::Storage::Plugin->lookup($type); my $opts = $plugin->check_config($storeid, $param, 0, 1); -- 2.20.1