From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 7BCAD619BC for ; Fri, 20 Nov 2020 17:40:28 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 737671521E for ; Fri, 20 Nov 2020 17:39:58 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id A793D15213 for ; Fri, 20 Nov 2020 17:39:57 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 70A1343D48 for ; Fri, 20 Nov 2020 17:39:57 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Fri, 20 Nov 2020 17:38:39 +0100 Message-Id: <20201120163845.1225080-10-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201120163845.1225080-1-f.gruenbichler@proxmox.com> References: <20201120163845.1225080-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.025 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [key.rs] Subject: [pbs-devel] [PATCH proxmox-backup 09/13] paperkey: add short key ID to subject X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Nov 2020 16:40:28 -0000 and strip fingerprint from keyfile data, since it's rather long and only informational anyway. Signed-off-by: Fabian Grünbichler --- src/bin/proxmox_backup_client/key.rs | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/bin/proxmox_backup_client/key.rs b/src/bin/proxmox_backup_client/key.rs index e56308b7..baae8726 100644 --- a/src/bin/proxmox_backup_client/key.rs +++ b/src/bin/proxmox_backup_client/key.rs @@ -387,7 +387,7 @@ fn paper_key( let data = file_get_contents(&path)?; let data = String::from_utf8(data)?; - let (data, is_private_key) = if data.starts_with("-----BEGIN ENCRYPTED PRIVATE KEY-----\n") { + let (data, subject, is_private_key) = if data.starts_with("-----BEGIN ENCRYPTED PRIVATE KEY-----\n") { let lines: Vec = data .lines() .map(|s| s.trim_end()) @@ -403,16 +403,26 @@ fn paper_key( bail!("unexpected key format"); } - (lines, true) + (lines, subject, true) } else { match serde_json::from_str::(&data) { - Ok(key_config) => { + Ok(mut key_config) => { + // add display version of fingerprint to subject and strip from key data + let subject = match (subject, key_config.fingerprint.take()) { + (Some(mut subject), Some(fingerprint)) => { + subject.push_str(&format!(" ({})", fingerprint)); + Some(subject) + }, + (None, Some(fingerprint)) => Some(format!("Fingerprint: {}", fingerprint)), + (subject, _) => subject, + }; + let lines = serde_json::to_string_pretty(&key_config)? .lines() .map(String::from) .collect(); - (lines, false) + (lines, subject, false) }, Err(err) => { eprintln!("Couldn't parse '{:?}' as KeyConfig - {}", path, err); -- 2.20.1