tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cli: tape key-restore: print more info for better ux

Browse Source 
as getting the marker error if we passed valid json (but not valid
key) is confusing

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2022-04-13 16:57:11 +02:00
parent ede9dc0d1a
commit 1fd46218ea
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/bin/proxmox_tape/encryption_key.rs
View File

@ -228,12 +228,13 @@ async fn restore_key(
let key = if serde_json::from_str::<KeyConfig>(&data).is_ok() {
&data
} else {
println!("key data seems not like a valid JSON key, trying to parse paper-key format");
const BEGIN_MARKER: &str = "-----BEGIN PROXMOX BACKUP KEY-----";
const END_MARKER: &str = "-----END PROXMOX BACKUP KEY-----";
// exported paperkey-file
let start = data
.find(BEGIN_MARKER)
.ok_or_else(|| format_err!("cannot find key start marker"))?
.ok_or_else(|| format_err!("cannot find a paper-key format start marker"))?
+ BEGIN_MARKER.len();
let data_remain = &data[start..];
let end = data_remain