yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

api: storage/config: use extract_sensitive_params from tools

Browse Source 
we have a more general version there

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak
2020-12-02 10:21:05 +01:00
committed by Thomas Lamprecht
parent 68f1fc2783
commit acc9c3acbc
1 changed files with 4 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
PVE/API2/Storage/Config.pm
View File

@ -4,7 +4,7 @@ use strict;
use warnings; use warnings;
use PVE::SafeSyslog; 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::Cluster qw(cfs_read_file cfs_write_file);
use PVE::Storage; use PVE::Storage;
use PVE::Storage::Plugin; use PVE::Storage::Plugin;
@ -112,28 +112,7 @@ __PACKAGE__->register_method ({
return &$api_storage_config($cfg, $param->{storage}); return &$api_storage_config($cfg, $param->{storage});
}}); }});
my sub extract_sensitive_params :prototype($$) { my $sensitive_params = [qw(password encryption-key)];
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;
}
__PACKAGE__->register_method ({ __PACKAGE__->register_method ({
name => 'create', name => 'create',
@ -182,7 +161,7 @@ __PACKAGE__->register_method ({
# fix me in section config create never need an empty entity. # fix me in section config create never need an empty entity.
delete $param->{nodes} if !$param->{nodes}; 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 $plugin = PVE::Storage::Plugin->lookup($type);
my $opts = $plugin->check_config($storeid, $param, 1, 1); my $opts = $plugin->check_config($storeid, $param, 1, 1);
@ -282,7 +261,7 @@ __PACKAGE__->register_method ({
my $scfg = PVE::Storage::storage_config($cfg, $storeid); my $scfg = PVE::Storage::storage_config($cfg, $storeid);
$type = $scfg->{type}; $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 $plugin = PVE::Storage::Plugin->lookup($type);
my $opts = $plugin->check_config($storeid, $param, 0, 1); my $opts = $plugin->check_config($storeid, $param, 0, 1);