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

pbs: add/update: return enc. key, if newly set or auto-generated

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht
2020-11-12 18:05:26 +01:00
parent cd69cedf3e
commit 0b6b98d189
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
PVE/Storage/PBSPlugin.pm
View File

@ -371,6 +371,8 @@ my $autogen_encryption_key = sub {
sub on_add_hook {
my ($class, $storeid, $scfg, %param) = @_;
my $res = {};
if (defined(my $password = $param{password})) {
pbs_set_password($scfg, $storeid, $password);
} else {
@ -379,19 +381,24 @@ sub on_add_hook {
if (defined(my $encryption_key = $param{'encryption-key'})) {
if ($encryption_key eq 'autogen') {
$autogen_encryption_key->($scfg, $storeid);
$res->{'encryption-key'} = $autogen_encryption_key->($scfg, $storeid);
} else {
pbs_set_encryption_key($scfg, $storeid, $encryption_key);
$res->{'encryption-key'} = $encryption_key;
}
$scfg->{'encryption-key'} = 1;
} else {
pbs_delete_encryption_key($scfg, $storeid);
}
return $res;
}
sub on_update_hook {
my ($class, $storeid, $scfg, %param) = @_;
my $res = {};
if (exists($param{password})) {
if (defined($param{password})) {
pbs_set_password($scfg, $storeid, $param{password});
@ -403,15 +410,18 @@ sub on_update_hook {
if (exists($param{'encryption-key'})) {
if (defined(my $encryption_key = delete($param{'encryption-key'}))) {
if ($encryption_key eq 'autogen') {
$autogen_encryption_key->($scfg, $storeid);
$res->{'encryption-key'} = $autogen_encryption_key->($scfg, $storeid);
} else {
pbs_set_encryption_key($scfg, $storeid, $encryption_key);
$res->{'encryption-key'} = $encryption_key;
}
$scfg->{'encryption-key'} = 1;
} else {
pbs_delete_encryption_key($scfg, $storeid);
}
}
return $res;
}
sub on_delete_hook {