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 7501AB8096 for ; Wed, 6 Mar 2024 16:49:36 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5D6F91BA1A for ; Wed, 6 Mar 2024 16:49:36 +0100 (CET) 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, 6 Mar 2024 16:49:34 +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 A82A14883A for ; Wed, 6 Mar 2024 16:49:34 +0100 (CET) Message-ID: <3ba76061-4230-4251-98a0-d4c7c74ccdd7@proxmox.com> Date: Wed, 6 Mar 2024 16:49:33 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: Proxmox Backup Server development discussion , Filip Schauer References: <20240305135645.96347-1-f.schauer@proxmox.com> <20240305135645.96347-5-f.schauer@proxmox.com> From: Max Carrara In-Reply-To: <20240305135645.96347-5-f.schauer@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.003 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: Re: [pbs-devel] [PATCH v4 vma-to-pbs 4/6] 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, 06 Mar 2024 15:49:36 -0000 On 3/5/24 14:56, Filip Schauer wrote: > Signed-off-by: Filip Schauer > --- > src/main.rs | 31 +++++++++++++++++++++++++++++-- > 1 file changed, 29 insertions(+), 2 deletions(-) > > diff --git a/src/main.rs b/src/main.rs > index 8d95b11..b58387b 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,25 @@ 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) => { > + std::fs::read_to_string(password_file).expect("Could not read password file") This here would be better handled by `anyhow::Context` [0]. > + } > + None => String::from_utf8(tty::read_password("Password: ")?)?, > + }; The entire block could *maybe* be something like: let pbs_password = if let Some(filename) = password_file { // ... } else { // ... }; .. as you're only really matching for one variant. > > - let pbs_password = String::from_utf8(tty::read_password(&"Password: ").unwrap()).unwrap(); The `unwrap()`s here should be replaced with a descriptive `anyhow::Context` [0] again, especially since it's UI code. > let key_password = match keyfile { > - Some(_) => Some(String::from_utf8(tty::read_password(&"Key Password: ").unwrap()).unwrap()), Here as well. > + Some(_) => { > + let key_password_file = matches.get_one::("key_password_file"); > + > + Some(match key_password_file { > + Some(key_password_file) => std::fs::read_to_string(key_password_file) > + .expect("Could not read key password file"), The `expect()` here too. > + None => String::from_utf8(tty::read_password("Key Password: ")?)?, > + }) > + } > None => None, > }; There probably isn't any prettier way to do this, so this whole nested match is fine IMO. > [0]: https://docs.rs/anyhow/latest/anyhow/trait.Context.html