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 91FF990FB1 for ; Wed, 3 Apr 2024 11:50:01 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 73605150CA for ; Wed, 3 Apr 2024 11:49:31 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 for ; Wed, 3 Apr 2024 11:49:30 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id B38DD44D16 for ; Wed, 3 Apr 2024 11:49:30 +0200 (CEST) From: Filip Schauer To: pbs-devel@lists.proxmox.com Date: Wed, 3 Apr 2024 11:49:05 +0200 Message-Id: <20240403094913.107177-2-f.schauer@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240403094913.107177-1-f.schauer@proxmox.com> References: <20240403094913.107177-1-f.schauer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.087 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH vma-to-pbs 1/9] Add the ability to provide credentials via files 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: Wed, 03 Apr 2024 09:50:01 -0000 Signed-off-by: Filip Schauer --- src/main.rs | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 2 deletions(-) diff --git a/src/main.rs b/src/main.rs index 8d95b11..578c38e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -280,6 +280,18 @@ fn main() -> Result<()> { .help("Encrypt the Backup") .action(ArgAction::SetTrue), ) + .arg( + Arg::new("password-file") + .long("password-file") + .value_name("PASSWORD_FILE") + .help("Password file"), + ) + .arg( + Arg::new("key-password-file") + .long("key-password-file") + .value_name("KEY_PASSWORD_FILE") + .help("Key password file"), + ) .arg(Arg::new("vma_file")) .get_matches(); @@ -296,10 +308,46 @@ fn main() -> Result<()> { let encrypt = matches.get_flag("encrypt"); let vma_file_path = matches.get_one::("vma_file").unwrap().to_string(); + let password_file = matches.get_one::("password-file"); + + let pbs_password = match password_file { + Some(password_file) => { + let mut password = + std::fs::read_to_string(password_file).context("Could not read password file")?; + + if password.ends_with('\n') || password.ends_with('\r') { + password.pop(); + if password.ends_with('\r') { + password.pop(); + } + } + + password + } + None => String::from_utf8(tty::read_password("Password: ")?)?, + }; - let pbs_password = String::from_utf8(tty::read_password(&"Password: ").unwrap()).unwrap(); let key_password = match keyfile { - Some(_) => Some(String::from_utf8(tty::read_password(&"Key Password: ").unwrap()).unwrap()), + Some(_) => { + let key_password_file = matches.get_one::("key_password_file"); + + Some(match key_password_file { + Some(key_password_file) => { + let mut key_password = std::fs::read_to_string(key_password_file) + .context("Could not read key password file")?; + + if key_password.ends_with('\n') || key_password.ends_with('\r') { + key_password.pop(); + if key_password.ends_with('\r') { + key_password.pop(); + } + } + + key_password + } + None => String::from_utf8(tty::read_password("Key Password: ")?)?, + }) + } None => None, }; -- 2.39.2