From 0dfce17a43a0db32645e5ab142116d3c5789faa8 Mon Sep 17 00:00:00 2001 From: Stefan Reiter Date: Mon, 12 Apr 2021 17:32:52 +0200 Subject: [PATCH] api/datastore: allow pxar file download of entire archive Treat filepaths like "/root.pxar.didx" without a trailing slash as wanting to download the entire archive content instead of erroring. The zip-creation code already works fine for this scenario. Signed-off-by: Stefan Reiter --- src/api2/admin/datastore.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs index a3e115f6..97860910 100644 --- a/src/api2/admin/datastore.rs +++ b/src/api2/admin/datastore.rs @@ -1385,7 +1385,7 @@ pub fn pxar_file_download( let mut split = components.splitn(2, |c| *c == b'/'); let pxar_name = std::str::from_utf8(split.next().unwrap())?; - let file_path = split.next().ok_or_else(|| format_err!("filepath looks strange '{}'", filepath))?; + let file_path = split.next().unwrap_or(b"/"); let (manifest, files) = read_backup_index(&datastore, &backup_dir)?; for file in files { if file.filename == pxar_name && file.crypt_mode == Some(CryptMode::Encrypt) { -- 2.39.2