From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id A06DD1FF153 for ; Mon, 06 Jul 2026 09:53:25 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 8C6882143E; Mon, 06 Jul 2026 09:53:24 +0200 (CEST) From: Maximiliano Sandoval To: Christian Ebner Subject: Re: [PATCH backup v3 1/3] fix #7054: client: remove trailing newlines from credentials In-Reply-To: (Christian Ebner's message of "Wed, 4 Mar 2026 09:40:50 +0100") References: <20260223093710.36009-1-m.sandoval@proxmox.com> <20260223093710.36009-2-m.sandoval@proxmox.com> User-Agent: mu4e 1.12.9; emacs 30.1 Date: Mon, 06 Jul 2026 09:53:16 +0200 Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1783324386086 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.000 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: 3BQRWJVIRLP6Y7S23HSFCLMHYYQOI7Z5 X-Message-ID-Hash: 3BQRWJVIRLP6Y7S23HSFCLMHYYQOI7Z5 X-MailFrom: m.sandoval@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: pbs-devel@lists.proxmox.com X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox Backup Server development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Christian Ebner writes: > two comments inline. > > On 2/23/26 10:37 AM, Maximiliano Sandoval wrote: >> Many tools, including systemd-ask-password will add a trailing new line, in >> order to improve usability we strip trailing newlines. >> For repositories and fingerprints we simply strip trailing whitespaces. >> For passwords, we refer to the password regex at proxmox-schema: >> `^[[:^cntrl:]]*$`, we can only strip trailing control characters without >> potentially breaking existing passwords. For the sake of avoiding to >> strip more than necessary we only strip trailing newlines. >> The encryption password is just a blob of bytes handled locally by the >> client, we cannot remove trailing whitespace here without potential >> breakage. Creation of such passwords (via >> proxmox_sys::tty::read_and_verify_password) only verifies valid utf-8 >> and len >= 5. >> Signed-off-by: Maximiliano Sandoval >> --- >> pbs-client/src/tools/mod.rs | 12 +++++++++++- >> 1 file changed, 11 insertions(+), 1 deletion(-) >> diff --git a/pbs-client/src/tools/mod.rs b/pbs-client/src/tools/mod.rs >> index 7a496d14c..f28d9f32f 100644 >> --- a/pbs-client/src/tools/mod.rs >> +++ b/pbs-client/src/tools/mod.rs >> @@ -168,7 +168,17 @@ fn get_secret_impl(env_variable: &str, credential_name: &str) -> Result> if let Some(password) = get_secret_from_env(env_variable)? { >> Ok(Some(password)) >> } else if let Some(password) = get_credential(credential_name)? { >> - String::from_utf8(password) >> + str::from_utf8(&password) >> + .map(|s| { >> + if matches!(credential_name, CRED_PBS_REPOSITORY | CRED_PBS_FINGERPRINT) { >> + s.trim_end() >> + } else if credential_name == CRED_PBS_PASSWORD { >> + s.trim_end_matches('\n') >> + } else { >> + s >> + } > > since this depends on the provided credential name anyways, why not do it in the > respective helpers instead, e.g. get_password() or get_default_repository()? By > that it is possible to avoid the conditional trimming here. Done in v4. >> + }) >> + .map(ToOwned::to_owned) >> .map(Option::Some) >> .map_err(|_err| format_err!("credential {credential_name} is not utf8 encoded")) >> } else { > > What about CRED_PBS_ENCRYPTION_PASSWORD? That should be handled as well. As explained in the commit message, the encryption password could end in '\n'. -- Maximiliano