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 0811D6074F for ; Tue, 17 Nov 2020 18:57:57 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 061DE13AA9 for ; Tue, 17 Nov 2020 18:57:57 +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 D777213A9D for ; Tue, 17 Nov 2020 18:57:55 +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 A48E6437E8 for ; Tue, 17 Nov 2020 18:57:55 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Tue, 17 Nov 2020 18:57:21 +0100 Message-Id: <20201117175725.3634238-4-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201117175725.3634238-1-f.gruenbichler@proxmox.com> References: <20201117175725.3634238-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.023 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. [mount.rs, proxmox-backup-client.rs] Subject: [pbs-devel] [PATCH proxmox-backup 3/7] client: print key fingerprint and master key 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: Tue, 17 Nov 2020 17:57:57 -0000 for operations where it makes sense. Signed-off-by: Fabian Grünbichler --- src/bin/proxmox-backup-client.rs | 11 +++++++++-- src/bin/proxmox_backup_client/mount.rs | 6 +++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/bin/proxmox-backup-client.rs b/src/bin/proxmox-backup-client.rs index c63c7eb6..54f7911d 100644 --- a/src/bin/proxmox-backup-client.rs +++ b/src/bin/proxmox-backup-client.rs @@ -1069,7 +1069,9 @@ async fn create_backup( let (crypt_config, rsa_encrypted_key) = match keydata { None => (None, None), Some(key) => { - let (key, created, _fingerprint) = decrypt_key(&key, &key::get_encryption_key_password)?; + let (key, created, fingerprint) = decrypt_key(&key, &key::get_encryption_key_password)?; + println!("Encryption key fingerprint: {}", + crate::tools::format::as_fingerprint(&fingerprint)); let crypt_config = CryptConfig::new(key)?; @@ -1078,6 +1080,9 @@ async fn create_backup( let pem_data = file_get_contents(path)?; let rsa = openssl::rsa::Rsa::public_key_from_pem(&pem_data)?; let enc_key = crypt_config.generate_rsa_encoded_key(rsa, created)?; + println!("Master key '{:?}'", + path); + (Some(Arc::new(crypt_config)), Some(enc_key)) } _ => (Some(Arc::new(crypt_config)), None), @@ -1380,7 +1385,9 @@ async fn restore(param: Value) -> Result { let crypt_config = match keydata { None => None, Some(key) => { - let (key, _, _) = decrypt_key(&key, &key::get_encryption_key_password)?; + let (key, _, fingerprint) = decrypt_key(&key, &key::get_encryption_key_password)?; + println!("Encryption key fingerprint: '{}'", + crate::tools::format::as_fingerprint(&fingerprint)); Some(Arc::new(CryptConfig::new(key)?)) } }; diff --git a/src/bin/proxmox_backup_client/mount.rs b/src/bin/proxmox_backup_client/mount.rs index 6283961e..a1c2ed86 100644 --- a/src/bin/proxmox_backup_client/mount.rs +++ b/src/bin/proxmox_backup_client/mount.rs @@ -182,7 +182,11 @@ async fn mount_do(param: Value, pipe: Option) -> Result { let crypt_config = match keyfile { None => None, Some(path) => { - let (key, _, _) = load_and_decrypt_key(&path, &crate::key::get_encryption_key_password)?; + println!("Encryption key file: '{:?}'", + path); + let (key, _, fingerprint) = load_and_decrypt_key(&path, &crate::key::get_encryption_key_password)?; + println!("Encryption key fingerprint: '{}'", + crate::tools::format::as_fingerprint(&fingerprint)); Some(Arc::new(CryptConfig::new(key)?)) } }; -- 2.20.1