Deuxfleurs/garage
44
56
Fork 73
Code Issues 100 Pull requests 14 Releases 30 Wiki Activity

Fix Multipart Upload with WinSCP (#164) (#193)
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse source 
Closes #164.

Reviewed-on: #193
Co-authored-by: Jill <kokakiwi@deuxfleurs.fr>
Co-committed-by: Jill <kokakiwi@deuxfleurs.fr>
This commit is contained in:
Jill 2022-01-17 11:18:40 +01:00 committed by Alex
parent b45dcc1925
commit fdcddbe168
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/api/s3_put.rs
View file

@ -511,7 +511,7 @@ pub async fn handle_complete_multipart_upload(
} }
let body_xml = roxmltree::Document::parse(std::str::from_utf8(&body)?)?; let body_xml = roxmltree::Document::parse(std::str::from_utf8(&body)?)?;
let body_list_of_parts = parse_complete_multpart_upload_body(&body_xml) let body_list_of_parts = parse_complete_multipart_upload_body(&body_xml)
.ok_or_bad_request("Invalid CompleteMultipartUpload XML")?; .ok_or_bad_request("Invalid CompleteMultipartUpload XML")?;
debug!( debug!(
"CompleteMultipartUpload list of parts: {:?}", "CompleteMultipartUpload list of parts: {:?}",
@ -703,7 +703,7 @@ struct CompleteMultipartUploadPart {
part_number: u64, part_number: u64,
} }
fn parse_complete_multpart_upload_body( fn parse_complete_multipart_upload_body(
xml: &roxmltree::Document, xml: &roxmltree::Document,
) -> Option<Vec<CompleteMultipartUploadPart>> { ) -> Option<Vec<CompleteMultipartUploadPart>> {
let mut parts = vec![]; let mut parts = vec![];
@ -715,6 +715,11 @@ fn parse_complete_multpart_upload_body(
} }
for item in cmu.children() { for item in cmu.children() {
// Only parse <Part> nodes
if !item.is_element() {
continue;
}
if item.has_tag_name("Part") { if item.has_tag_name("Part") {
let etag = item.children().find(|e| e.has_tag_name("ETag"))?.text()?; let etag = item.children().find(|e| e.has_tag_name("ETag"))?.text()?;
let part_number = item let part_number = item