From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <m.carrara@proxmox.com>
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 133A2BB6F5
for <pbs-devel@lists.proxmox.com>; Mon, 25 Mar 2024 13:34:24 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id E88963AE5
for <pbs-devel@lists.proxmox.com>; Mon, 25 Mar 2024 13:33:53 +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) server-digest SHA256)
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS
for <pbs-devel@lists.proxmox.com>; Mon, 25 Mar 2024 13:33:53 +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 E54B541A2B
for <pbs-devel@lists.proxmox.com>; Mon, 25 Mar 2024 13:33:52 +0100 (CET)
Content-Type: text/plain; charset=UTF-8
Date: Mon, 25 Mar 2024 13:33:51 +0100
Message-Id: <D02U1N6CGQKL.2PCM24CI3WPFD@proxmox.com>
Cc: <w.bumiller@proxmox.com>
From: "Max Carrara" <m.carrara@proxmox.com>
To: "Proxmox Backup Server development discussion"
<pbs-devel@lists.proxmox.com>
Content-Transfer-Encoding: quoted-printable
Mime-Version: 1.0
X-Mailer: aerc 0.17.0-72-g6a84f1331f1c
References: <20240320141516.213930-1-f.schauer@proxmox.com>
<20240320141516.213930-5-f.schauer@proxmox.com>
In-Reply-To: <20240320141516.213930-5-f.schauer@proxmox.com>
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.022 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: Re: [pbs-devel] [PATCH vma-to-pbs 04/10] 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
<pbs-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/>
List-Post: <mailto:pbs-devel@lists.proxmox.com>
List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Mon, 25 Mar 2024 12:34:24 -0000
On Wed Mar 20, 2024 at 3:15 PM CET, Filip Schauer wrote:
> Signed-off-by: Filip Schauer <f.schauer@proxmox.com>
> ---
> 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();
One thing I had noticed when using the CLI: Would it maaaybe be nicer to
use e.g. --password-file instead of --password_file? AFAIR @Wolfgang
mentioned something regarding this off list.
> =20
> @@ -296,10 +308,25 @@ fn main() -> Result<()> {
> let encrypt =3D matches.get_flag("encrypt");
> =20
> let vma_file_path =3D matches.get_one::<String>("vma_file").unwrap()=
.to_string();
> + let password_file =3D matches.get_one::<String>("password_file");
> +
> + let pbs_password =3D match password_file {
> + Some(password_file) =3D> {
> + std::fs::read_to_string(password_file).expect("Could not rea=
d password file")
You changed this later and got rid of the undying, but that fix could've
perhaps been in here already.
> + }
> + None =3D> String::from_utf8(tty::read_password("Password: ")?)?,
> + };
> =20
> - let pbs_password =3D String::from_utf8(tty::read_password(&"Password=
: ").unwrap()).unwrap();
> let key_password =3D match keyfile {
> - Some(_) =3D> Some(String::from_utf8(tty::read_password(&"Key Pas=
sword: ").unwrap()).unwrap()),
> + Some(_) =3D> {
> + let key_password_file =3D matches.get_one::<String>("key_pas=
sword_file");
> +
> + Some(match key_password_file {
> + Some(key_password_file) =3D> std::fs::read_to_string(key=
_password_file)
> + .expect("Could not read key password file"),
Same as above.
> + None =3D> String::from_utf8(tty::read_password("Key Pass=
word: ")?)?,
> + })
> + }
> None =3D> None,
> };
> =20
[0]: https://docs.rs/anyhow/1.0.79/anyhow/trait.Context.html