Skip to content

fix: correct multipart XML CompleteMultipartUploadResult #183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
harshavardhana merged 1 commit into from
Jan 5, 2025
Merged

fix: correct multipart XML CompleteMultipartUploadResult #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions include/miniocpp/response.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,10 @@ struct CompleteMultipartUploadResponse : public Response {
std::string location;
std::string etag;
std::string version_id;
std::string checksumCRC32;
std::string checksumCRC32C;
std::string checksumSHA1;
std::string checksumSHA256;

CompleteMultipartUploadResponse() = default;

Expand Down
15 changes: 13 additions & 2 deletions src/response.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,7 @@ CompleteMultipartUploadResponse CompleteMultipartUploadResponse::ParseXML(
if (!result) {
return error::make<CompleteMultipartUploadResponse>("unable to parse XML");
}
auto root = xdoc.select_node("/CompleteMultipartUploadOutput");

auto root = xdoc.select_node("/CompleteMultipartUploadResult");
pugi::xpath_node text;

text = root.node().select_node("Bucket/text()");
Expand All @@ -139,6 +138,18 @@ CompleteMultipartUploadResponse CompleteMultipartUploadResponse::ParseXML(
text = root.node().select_node("ETag/text()");
resp.etag = utils::Trim(text.node().value(), '"');

text = root.node().select_node("ChecksumCRC32/text()");
resp.checksumCRC32 = text.node().value();

text = root.node().select_node("ChecksumCRC32/text()");
resp.checksumCRC32C = text.node().value();

text = root.node().select_node("ChecksumSHA1/text()");
resp.checksumSHA1 = text.node().value();

text = root.node().select_node("ChecksumSHA256/text()");
resp.checksumSHA256 = text.node().value();

resp.version_id = version_id;

return resp;
Expand Down
11 changes: 6 additions & 5 deletions tests/tests.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,9 +461,7 @@ class Tests {
std::string object_name = RandObjectName();
std::string data = "PutObject()";
std::stringstream ss(data);
minio::s3::PutObjectArgs args(
ss, static_cast<long>(data.length()),
0); // PWTODO: PutObjectArgs should accept size_t instead of long
minio::s3::PutObjectArgs args(ss, data.length(), 0);
args.bucket = bucket_name_;
args.object = object_name;
minio::s3::PutObjectResponse resp = client_.PutObject(args);
Expand All @@ -475,16 +473,19 @@ class Tests {

{
std::string object_name = RandObjectName();
size_t size = 13930573;
size_t size = 67108865; // (64MiB + 1) bytes
RandCharStream stream(size);
minio::s3::PutObjectArgs args(stream, static_cast<long>(size), 0);
minio::s3::PutObjectArgs args(stream, size, 0);
args.bucket = bucket_name_;
args.object = object_name;
minio::s3::PutObjectResponse resp = client_.PutObject(args);
if (!resp) {
throw std::runtime_error("<Multipart> PutObject(): " +
resp.Error().String());
}
if (resp.etag == "") {
throw std::runtime_error("<Multipart> PutObject(): etag is missing");
}
RemoveObject(bucket_name_, object_name);
}
}
Expand Down
Loading