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

add encrypted info to Manifest

Browse Source 
we want to save if a file of a backup is encrypted, so that we can
* show that info on the gui
* can later decide if we need to decrypt the backup

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak
2020-06-18 13:55:23 +02:00
committed by Dietmar Maurer
parent 16021f6ab7
commit e181d2f6da
4 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -950,6 +950,8 @@ async fn create_backup(
}
};
let is_encrypted = Some(crypt_config.is_some());
let client = BackupWriter::start(
client,
repo.store(),
@ -972,14 +974,14 @@ async fn create_backup(
let stats = client
.upload_blob_from_file(&filename, &target, crypt_config.clone(), true)
.await?;
manifest.add_file(target, stats.size, stats.csum)?;
manifest.add_file(target, stats.size, stats.csum, is_encrypted)?;
}
BackupSpecificationType::LOGFILE => { // fixme: remove - not needed anymore ?
println!("Upload log file '{}' to '{:?}' as {}", filename, repo, target);
let stats = client
.upload_blob_from_file(&filename, &target, crypt_config.clone(), true)
.await?;
manifest.add_file(target, stats.size, stats.csum)?;
manifest.add_file(target, stats.size, stats.csum, is_encrypted)?;
}
BackupSpecificationType::PXAR => {
// start catalog upload on first use
@ -1005,7 +1007,7 @@ async fn create_backup(
pattern_list.clone(),
entries_max as usize,
).await?;
manifest.add_file(target, stats.size, stats.csum)?;
manifest.add_file(target, stats.size, stats.csum, is_encrypted)?;
catalog.lock().unwrap().end_directory()?;
}
BackupSpecificationType::IMAGE => {
@ -1019,7 +1021,7 @@ async fn create_backup(
verbose,
crypt_config.clone(),
).await?;
manifest.add_file(target, stats.size, stats.csum)?;
manifest.add_file(target, stats.size, stats.csum, is_encrypted)?;
}
}
}
@ -1036,7 +1038,7 @@ async fn create_backup(
if let Some(catalog_result_rx) = catalog_result_tx {
let stats = catalog_result_rx.await??;
manifest.add_file(CATALOG_NAME.to_owned(), stats.size, stats.csum)?;
manifest.add_file(CATALOG_NAME.to_owned(), stats.size, stats.csum, is_encrypted)?;
}
}
@ -1046,7 +1048,7 @@ async fn create_backup(
let stats = client
.upload_blob_from_data(rsa_encrypted_key, target, None, false, false)
.await?;
manifest.add_file(format!("{}.blob", target), stats.size, stats.csum)?;
manifest.add_file(format!("{}.blob", target), stats.size, stats.csum, is_encrypted)?;
// openssl rsautl -decrypt -inkey master-private.pem -in rsa-encrypted.key -out t
/*