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

backup writer api: verify checksum inside close

Browse Source
This commit is contained in:
Dietmar Maurer
2019-09-23 10:56:53 +02:00
parent c8c4051aa7
commit fb6026b66b
3 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/api2/backup/environment.rs
View File

@ -326,7 +326,7 @@ impl BackupEnvironment {
}
/// Close dynamic writer
pub fn dynamic_writer_close(&self, wid: usize, chunk_count: u64, size: u64) -> Result<(), Error> {
pub fn dynamic_writer_close(&self, wid: usize, chunk_count: u64, size: u64, csum: [u8; 32]) -> Result<(), Error> {
let mut state = self.state.lock().unwrap();
state.ensure_unfinished()?;
@ -346,7 +346,12 @@ impl BackupEnvironment {
let uuid = data.index.uuid;
let csum = data.index.close()?;
let expected_csum = data.index.close()?;
println!("server checksum {:?} client: {:?}", expected_csum, csum);
if csum != expected_csum {
bail!("dynamic writer '{}' close failed - got unexpected checksum", data.name);
}
self.log_upload_stat(&data.name, &csum, &uuid, size, chunk_count, &data.upload_stat);
@ -356,7 +361,7 @@ impl BackupEnvironment {
}
/// Close fixed writer
pub fn fixed_writer_close(&self, wid: usize, chunk_count: u64, size: u64) -> Result<(), Error> {
pub fn fixed_writer_close(&self, wid: usize, chunk_count: u64, size: u64, csum: [u8; 32]) -> Result<(), Error> {
let mut state = self.state.lock().unwrap();
state.ensure_unfinished()?;
@ -382,9 +387,14 @@ impl BackupEnvironment {
let uuid = data.index.uuid;
let csum = data.index.close()?;
let expected_csum = data.index.close()?;
self.log_upload_stat(&data.name, &csum, &uuid, size, chunk_count, &data.upload_stat);
println!("server checksum {:?} client: {:?}", expected_csum, csum);
if csum != expected_csum {
bail!("fixed writer '{}' close failed - got unexpected checksum", data.name);
}
self.log_upload_stat(&data.name, &expected_csum, &uuid, size, chunk_count, &data.upload_stat);
state.file_counter += 1;