public inbox for pbs-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Maximiliano Sandoval <m.sandoval@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH backup v2 2/7] pbs-client: add helper for getting UTF-8 secrets
Date: Thu, 27 Mar 2025 11:47:25 +0100	[thread overview]
Message-ID: <20250327104730.199623-2-m.sandoval@proxmox.com> (raw)
In-Reply-To: <20250327104730.199623-1-m.sandoval@proxmox.com>

We are going to add more credentials so it makes sense to have a common
helper to get the secrets.

Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
 pbs-client/src/tools/mod.rs | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pbs-client/src/tools/mod.rs b/pbs-client/src/tools/mod.rs
index a42fa114..efd2e139 100644
--- a/pbs-client/src/tools/mod.rs
+++ b/pbs-client/src/tools/mod.rs
@@ -153,6 +153,25 @@ fn get_secret_from_env(base_name: &str) -> Result<Option<String>, Error> {
     Ok(None)
 }
 
+/// Gets a secret or value from the environment.
+///
+/// Checks for an environment variable named `env_variable`, and if missing, it
+/// checks for a system [credential] named `credential_name`. Assumes the secret
+/// is UTF-8 encoded.
+///
+/// [credential]: https://systemd.io/CREDENTIALS/
+fn get_secret_impl(env_variable: &str, credential_name: &str) -> Result<Option<String>, Error> {
+    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)
+            .map(Option::Some)
+            .map_err(|_err| format_err!("credential {credential_name} is not utf8 encoded"))
+    } else {
+        Ok(None)
+    }
+}
+
 /// Gets the backup server's password.
 ///
 /// Looks for a password in the `PBS_PASSWORD` environment variable, if there
-- 
2.39.5



_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel


  reply	other threads:[~2025-03-27 10:48 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-03-27 10:47 [pbs-devel] [PATCH backup v2 1/7] pbs-client: use a const for the PBS_REPOSITORY env variable Maximiliano Sandoval
2025-03-27 10:47 ` Maximiliano Sandoval [this message]
2025-03-27 11:57   ` [pbs-devel] [PATCH backup v2 2/7] pbs-client: add helper for getting UTF-8 secrets Christian Ebner
2025-03-27 12:16     ` Maximiliano Sandoval
2025-03-27 12:41       ` Christian Ebner
2025-03-27 10:47 ` [pbs-devel] [PATCH backup v2 3/7] pbs-client: use helper for getting UTF-8 password Maximiliano Sandoval
2025-03-27 10:47 ` [pbs-devel] [PATCH backup v2 4/7] pbs-client: make get_encryption_password return a String Maximiliano Sandoval
2025-03-27 10:47 ` [pbs-devel] [PATCH backup v2 5/7] pbs-client: allow reading default repository from system credential Maximiliano Sandoval
2025-03-27 10:47 ` [pbs-devel] [PATCH backup v2 6/7] pbs-client: allow reading fingerprint " Maximiliano Sandoval
2025-03-27 10:47 ` [pbs-devel] [PATCH backup v2 7/7] docs: client: add section about system credentials Maximiliano Sandoval
2025-04-02  9:57   ` Christian Ebner
2025-04-02 10:05 ` [pbs-devel] [PATCH backup v2 1/7] pbs-client: use a const for the PBS_REPOSITORY env variable Christian Ebner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250327104730.199623-2-m.sandoval@proxmox.com \
    --to=m.sandoval@proxmox.com \
    --cc=pbs-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal