From 1fd46218eaa023697c8cbc8981016a39c256fb7d Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Wed, 13 Apr 2022 16:57:11 +0200 Subject: [PATCH] cli: tape key-restore: print more info for better ux as getting the marker error if we passed valid json (but not valid key) is confusing Signed-off-by: Thomas Lamprecht --- src/bin/proxmox_tape/encryption_key.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/bin/proxmox_tape/encryption_key.rs b/src/bin/proxmox_tape/encryption_key.rs index cbe249de..2e2c0430 100644 --- a/src/bin/proxmox_tape/encryption_key.rs +++ b/src/bin/proxmox_tape/encryption_key.rs @@ -228,12 +228,13 @@ async fn restore_key( let key = if serde_json::from_str::(&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