[pbs-devel] [PATCH backup 2/5] pbs-client: allow reading default repository from system credential
Maximiliano Sandoval
m.sandoval at proxmox.com
Wed Mar 26 15:26:06 CET 2025
Signed-off-by: Maximiliano Sandoval <m.sandoval at proxmox.com>
---
pbs-client/src/tools/mod.rs | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/pbs-client/src/tools/mod.rs b/pbs-client/src/tools/mod.rs
index a42fa1149..acb932c64 100644
--- a/pbs-client/src/tools/mod.rs
+++ b/pbs-client/src/tools/mod.rs
@@ -39,6 +39,8 @@ const ENV_VAR_CREDENTIALS_DIRECTORY: &str = "CREDENTIALS_DIRECTORY";
const CRED_PBS_ENCRYPTION_PASSWORD: &str = "proxmox-backup-client.encryption-password";
/// Credential name of the the password.
const CRED_PBS_PASSWORD: &str = "proxmox-backup-client.password";
+/// Credential name of the the repository.
+const CRED_PBS_REPOSITORY: &str = "proxmox-backup-client.repository";
pub const REPO_URL_SCHEMA: Schema = StringSchema::new("Repository URL.")
.format(&BACKUP_REPO_URL)
@@ -196,7 +198,17 @@ pub fn get_encryption_password() -> Result<Option<Vec<u8>>, Error> {
}
pub fn get_default_repository() -> Option<String> {
- std::env::var(ENV_VAR_PBS_REPOSITORY).ok()
+ if let Ok(repository) = std::env::var(ENV_VAR_PBS_REPOSITORY) {
+ Some(repository)
+ } else if let Ok(Some(repository)) = get_credential(CRED_PBS_REPOSITORY).inspect_err(|err| {
+ proxmox_log::error!("Could not read credential {CRED_PBS_REPOSITORY}: {err}")
+ }) {
+ String::from_utf8(repository)
+ .inspect_err(|_err| proxmox_log::error!("non-utf8 repository credential"))
+ .ok()
+ } else {
+ None
+ }
}
pub fn remove_repository_from_value(param: &mut Value) -> Result<BackupRepository, Error> {
--
2.39.5
More information about the pbs-devel
mailing list