tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

client: use default encryption key if it is available

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller
2020-07-06 12:07:50 +02:00
parent 9696f5193b
commit 887018bb79
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/bin/proxmox-backup-client.rs
View File

@ -754,7 +754,10 @@ async fn create_backup(
verify_chunk_size(size)?;
}
let keyfile = param["keyfile"].as_str().map(PathBuf::from);
let keyfile = match param["keyfile"].as_str() {
Some(path) => Some(PathBuf::from(path)),
None => key::optional_default_key_path()?,
};
let backup_id = param["backup-id"].as_str().unwrap_or(&proxmox::tools::nodename());
@ -1149,7 +1152,10 @@ async fn restore(param: Value) -> Result<Value, Error> {
let target = tools::required_string_param(&param, "target")?;
let target = if target == "-" { None } else { Some(target) };
let keyfile = param["keyfile"].as_str().map(PathBuf::from);
let keyfile = match param["keyfile"].as_str() {
Some(path) => Some(PathBuf::from(path)),
None => key::optional_default_key_path()?,
};
let crypt_config = match keyfile {
None => None,
@ -1293,7 +1299,10 @@ async fn upload_log(param: Value) -> Result<Value, Error> {
let mut client = connect(repo.host(), repo.user())?;
let keyfile = param["keyfile"].as_str().map(PathBuf::from);
let keyfile = match param["keyfile"].as_str() {
Some(path) => Some(PathBuf::from(path)),
None => key::optional_default_key_path()?,
};
let crypt_config = match keyfile {
None => None,