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

api: always use complete file names (including add exctensions)

Browse Source
This commit is contained in:
Dietmar Maurer
2019-08-07 10:10:14 +02:00
parent d7c243977d
commit 4af0ee055a
3 changed files with 24 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/api2/backup.rs
View File

@ -228,11 +228,9 @@ fn create_dynamic_index(
let name = tools::required_string_param(&param, "archive-name")?.to_owned();
let mut archive_name = name.clone();
if !archive_name.ends_with(".pxar") {
let archive_name = name.clone();
if !archive_name.ends_with(".pxar.didx") {
bail!("wrong archive extension: '{}'", archive_name);
} else {
archive_name.push_str(".didx");
}
let mut path = env.backup_dir.relative_path();
@ -270,11 +268,9 @@ fn create_fixed_index(
let name = tools::required_string_param(&param, "archive-name")?.to_owned();
let size = tools::required_integer_param(&param, "size")? as usize;
let mut archive_name = name.clone();
if !archive_name.ends_with(".img") {
let archive_name = name.clone();
if !archive_name.ends_with(".img.fidx") {
bail!("wrong archive extension: '{}'", archive_name);
} else {
archive_name.push_str(".fidx");
}
let mut path = env.backup_dir.relative_path();
@ -502,12 +498,10 @@ fn dynamic_chunk_index(
let env: &BackupEnvironment = rpcenv.as_ref();
let mut archive_name = tools::required_string_param(&param, "archive-name")?.to_owned();
let archive_name = tools::required_string_param(&param, "archive-name")?.to_owned();
if !archive_name.ends_with(".pxar") {
if !archive_name.ends_with(".pxar.didx") {
bail!("wrong archive extension: '{}'", archive_name);
} else {
archive_name.push_str(".didx");
}
let empty_response = {
@ -575,12 +569,10 @@ fn fixed_chunk_index(
let env: &BackupEnvironment = rpcenv.as_ref();
let mut archive_name = tools::required_string_param(&param, "archive-name")?.to_owned();
let archive_name = tools::required_string_param(&param, "archive-name")?.to_owned();
if !archive_name.ends_with(".img") {
if !archive_name.ends_with(".img.fidx") {
bail!("wrong archive extension: '{}'", archive_name);
} else {
archive_name.push_str(".fidx");
}
let empty_response = {

6
src/api2/backup/upload_chunk.rs
View File

@ -242,13 +242,15 @@ fn upload_blob(
rpcenv: Box<dyn RpcEnvironment>,
) -> Result<BoxFut, Error> {
let mut file_name = tools::required_string_param(&param, "file-name")?.to_owned();
let file_name = tools::required_string_param(&param, "file-name")?.to_owned();
let encoded_size = tools::required_integer_param(&param, "encoded-size")? as usize;
let env: &BackupEnvironment = rpcenv.as_ref();
file_name.push_str(".blob");
if !file_name.ends_with(".blob") {
bail!("wrong blob file extension: '{}'", file_name);
}
let env2 = env.clone();
let env3 = env.clone();