From 3cc2eb738f3b8ce369e8dfe43e6e7df9d179c347 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Tue, 24 Nov 2020 22:09:38 +0100 Subject: [PATCH] pbs add/update: save fingerprint in storage config fallback to the old truthy "1" if not available Signed-off-by: Thomas Lamprecht --- PVE/Storage/PBSPlugin.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/PVE/Storage/PBSPlugin.pm b/PVE/Storage/PBSPlugin.pm index 3e66bfc..1f576d3 100644 --- a/PVE/Storage/PBSPlugin.pm +++ b/PVE/Storage/PBSPlugin.pm @@ -394,6 +394,7 @@ sub on_add_hook { my $decoded_key; if ($encryption_key eq 'autogen') { $res->{'encryption-key'} = $autogen_encryption_key->($scfg, $storeid); + $decoded_key = decode_json($res->{'encryption-key'}); } else { $decoded_key = eval { decode_json($encryption_key) }; if ($@ || !exists($decoded_key->{data})) { @@ -402,7 +403,7 @@ sub on_add_hook { pbs_set_encryption_key($scfg, $storeid, $encryption_key); $res->{'encryption-key'} = $encryption_key; } - $scfg->{'encryption-key'} = 1; + $scfg->{'encryption-key'} = $decoded_key->{fingerprint} || 1; } else { pbs_delete_encryption_key($scfg, $storeid); } @@ -428,6 +429,7 @@ sub on_update_hook { my $decoded_key; if ($encryption_key eq 'autogen') { $res->{'encryption-key'} = $autogen_encryption_key->($scfg, $storeid); + $decoded_key = decode_json($res->{'encryption-key'}); } else { $decoded_key = eval { decode_json($encryption_key) }; if ($@ || !exists($decoded_key->{data})) { @@ -436,7 +438,7 @@ sub on_update_hook { pbs_set_encryption_key($scfg, $storeid, $encryption_key); $res->{'encryption-key'} = $encryption_key; } - $scfg->{'encryption-key'} = 1; + $scfg->{'encryption-key'} = $decoded_key->{fingerprint} || 1; } else { pbs_delete_encryption_key($scfg, $storeid); }