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

pbs add/update: save fingerprint in storage config

Browse Source 
fallback to the old truthy "1" if not available

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht
2020-11-24 22:09:38 +01:00
parent d2c47b3837
commit 3cc2eb738f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
PVE/Storage/PBSPlugin.pm
View File

@ -394,6 +394,7 @@ sub on_add_hook {
my $decoded_key; my $decoded_key;
if ($encryption_key eq 'autogen') { if ($encryption_key eq 'autogen') {
$res->{'encryption-key'} = $autogen_encryption_key->($scfg, $storeid); $res->{'encryption-key'} = $autogen_encryption_key->($scfg, $storeid);
$decoded_key = decode_json($res->{'encryption-key'});
} else { } else {
$decoded_key = eval { decode_json($encryption_key) }; $decoded_key = eval { decode_json($encryption_key) };
if ($@ || !exists($decoded_key->{data})) { if ($@ || !exists($decoded_key->{data})) {
@ -402,7 +403,7 @@ sub on_add_hook {
pbs_set_encryption_key($scfg, $storeid, $encryption_key); pbs_set_encryption_key($scfg, $storeid, $encryption_key);
$res->{'encryption-key'} = $encryption_key; $res->{'encryption-key'} = $encryption_key;
} }
$scfg->{'encryption-key'} = 1; $scfg->{'encryption-key'} = $decoded_key->{fingerprint} || 1;
} else { } else {
pbs_delete_encryption_key($scfg, $storeid); pbs_delete_encryption_key($scfg, $storeid);
} }
@ -428,6 +429,7 @@ sub on_update_hook {
my $decoded_key; my $decoded_key;
if ($encryption_key eq 'autogen') { if ($encryption_key eq 'autogen') {
$res->{'encryption-key'} = $autogen_encryption_key->($scfg, $storeid); $res->{'encryption-key'} = $autogen_encryption_key->($scfg, $storeid);
$decoded_key = decode_json($res->{'encryption-key'});
} else { } else {
$decoded_key = eval { decode_json($encryption_key) }; $decoded_key = eval { decode_json($encryption_key) };
if ($@ || !exists($decoded_key->{data})) { if ($@ || !exists($decoded_key->{data})) {
@ -436,7 +438,7 @@ sub on_update_hook {
pbs_set_encryption_key($scfg, $storeid, $encryption_key); pbs_set_encryption_key($scfg, $storeid, $encryption_key);
$res->{'encryption-key'} = $encryption_key; $res->{'encryption-key'} = $encryption_key;
} }
$scfg->{'encryption-key'} = 1; $scfg->{'encryption-key'} = $decoded_key->{fingerprint} || 1;
} else { } else {
pbs_delete_encryption_key($scfg, $storeid); pbs_delete_encryption_key($scfg, $storeid);
} }