octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2025-01-03 13:07:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bug about multipart upload with SSE

Browse Source
This commit is contained in:
Takeshi Nakatani 2023-01-06 10:16:43 +00:00 committed by Andrew Gaul
parent a40004f9cc
commit 222110e153
1 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/curl.cpp
View File

@ -3210,7 +3210,8 @@ int S3fsCurl::PutHeadRequest(const char* tpath, headers_t& meta, bool is_copy)
bodydata.Clear(); bodydata.Clear();
std::string contype = S3fsCurl::LookupMimeType(std::string(tpath)); std::string contype = S3fsCurl::LookupMimeType(std::string(tpath));
requestHeaders = curl_slist_sort_insert(requestHeaders, "Content-Type", contype.c_str()); bool need_sse_head = (S3fsCurl::GetSseType() != sse_type_t::SSE_DISABLE);
requestHeaders = curl_slist_sort_insert(requestHeaders, "Content-Type", contype.c_str());
// Make request headers // Make request headers
for(headers_t::iterator iter = meta.begin(); iter != meta.end(); ++iter){ for(headers_t::iterator iter = meta.begin(); iter != meta.end(); ++iter){
@ -3224,18 +3225,28 @@ int S3fsCurl::PutHeadRequest(const char* tpath, headers_t& meta, bool is_copy)
requestHeaders = curl_slist_sort_insert(requestHeaders, iter->first.c_str(), value.c_str()); requestHeaders = curl_slist_sort_insert(requestHeaders, iter->first.c_str(), value.c_str());
}else if(key == "x-amz-server-side-encryption" && value != "aws:kms"){ }else if(key == "x-amz-server-side-encryption" && value != "aws:kms"){
// Only copy mode. // Only copy mode.
if(is_copy && !AddSseRequestHead(sse_type_t::SSE_S3, value, false, true)){ if(is_copy){
S3FS_PRN_WARN("Failed to insert SSE-S3 header."); if(AddSseRequestHead(sse_type_t::SSE_S3, value, false, true)){
need_sse_head = false;
}else{
S3FS_PRN_WARN("Failed to insert SSE-S3 header.");
}
} }
}else if(key == "x-amz-server-side-encryption-aws-kms-key-id"){ }else if(key == "x-amz-server-side-encryption-aws-kms-key-id"){
// Only copy mode. // Only copy mode.
if(is_copy && !value.empty() && !AddSseRequestHead(sse_type_t::SSE_KMS, value, false, true)){ if(is_copy && !value.empty()){
S3FS_PRN_WARN("Failed to insert SSE-KMS header."); if(AddSseRequestHead(sse_type_t::SSE_KMS, value, false, true)){
need_sse_head = false;
}else{
S3FS_PRN_WARN("Failed to insert SSE-KMS header.");
}
} }
}else if(key == "x-amz-server-side-encryption-customer-key-md5"){ }else if(key == "x-amz-server-side-encryption-customer-key-md5"){
// Only copy mode. // Only copy mode.
if(is_copy){ if(is_copy){
if(!AddSseRequestHead(sse_type_t::SSE_C, value, true, true) || !AddSseRequestHead(sse_type_t::SSE_C, value, true, false)){ if(AddSseRequestHead(sse_type_t::SSE_C, value, true, true) || AddSseRequestHead(sse_type_t::SSE_C, value, true, false)){
need_sse_head = false;
}else{
S3FS_PRN_WARN("Failed to insert SSE-C header."); S3FS_PRN_WARN("Failed to insert SSE-C header.");
} }
} }
@ -3250,7 +3261,7 @@ int S3fsCurl::PutHeadRequest(const char* tpath, headers_t& meta, bool is_copy)
requestHeaders = curl_slist_sort_insert(requestHeaders, "x-amz-storage-class", GetStorageClass().c_str()); requestHeaders = curl_slist_sort_insert(requestHeaders, "x-amz-storage-class", GetStorageClass().c_str());
} }
// SSE // SSE
if(!is_copy){ if(need_sse_head){
std::string ssevalue; std::string ssevalue;
if(!AddSseRequestHead(S3fsCurl::GetSseType(), ssevalue, false, false)){ if(!AddSseRequestHead(S3fsCurl::GetSseType(), ssevalue, false, false)){
S3FS_PRN_WARN("Failed to set SSE header, but continue..."); S3FS_PRN_WARN("Failed to set SSE header, but continue...");
@ -3650,6 +3661,7 @@ int S3fsCurl::PreMultipartPostRequest(const char* tpath, headers_t& meta, std::s
responseHeaders.clear(); responseHeaders.clear();
std::string contype = S3fsCurl::LookupMimeType(std::string(tpath)); std::string contype = S3fsCurl::LookupMimeType(std::string(tpath));
bool need_sse_head = (S3fsCurl::GetSseType() != sse_type_t::SSE_DISABLE);
for(headers_t::iterator iter = meta.begin(); iter != meta.end(); ++iter){ for(headers_t::iterator iter = meta.begin(); iter != meta.end(); ++iter){
std::string key = lower(iter->first); std::string key = lower(iter->first);
@ -3660,18 +3672,28 @@ int S3fsCurl::PreMultipartPostRequest(const char* tpath, headers_t& meta, std::s
requestHeaders = curl_slist_sort_insert(requestHeaders, iter->first.c_str(), value.c_str()); requestHeaders = curl_slist_sort_insert(requestHeaders, iter->first.c_str(), value.c_str());
}else if(key == "x-amz-server-side-encryption" && value != "aws:kms"){ }else if(key == "x-amz-server-side-encryption" && value != "aws:kms"){
// Only copy mode. // Only copy mode.
if(is_copy && !AddSseRequestHead(sse_type_t::SSE_S3, value, false, true)){ if(is_copy){
S3FS_PRN_WARN("Failed to insert SSE-S3 header."); if(AddSseRequestHead(sse_type_t::SSE_S3, value, false, true)){
need_sse_head = false;
}else{
S3FS_PRN_WARN("Failed to insert SSE-S3 header.");
}
} }
}else if(key == "x-amz-server-side-encryption-aws-kms-key-id"){ }else if(key == "x-amz-server-side-encryption-aws-kms-key-id"){
// Only copy mode. // Only copy mode.
if(is_copy && !value.empty() && !AddSseRequestHead(sse_type_t::SSE_KMS, value, false, true)){ if(is_copy && !value.empty()){
S3FS_PRN_WARN("Failed to insert SSE-KMS header."); if(AddSseRequestHead(sse_type_t::SSE_KMS, value, false, true)){
need_sse_head = false;
}else{
S3FS_PRN_WARN("Failed to insert SSE-KMS header.");
}
} }
}else if(key == "x-amz-server-side-encryption-customer-key-md5"){ }else if(key == "x-amz-server-side-encryption-customer-key-md5"){
// Only copy mode. // Only copy mode.
if(is_copy){ if(is_copy){
if(!AddSseRequestHead(sse_type_t::SSE_C, value, true, true) || !AddSseRequestHead(sse_type_t::SSE_C, value, true, false)){ if(AddSseRequestHead(sse_type_t::SSE_C, value, true, true) || AddSseRequestHead(sse_type_t::SSE_C, value, true, false)){
need_sse_head = false;
}else{
S3FS_PRN_WARN("Failed to insert SSE-C header."); S3FS_PRN_WARN("Failed to insert SSE-C header.");
} }
} }
@ -3685,7 +3707,7 @@ int S3fsCurl::PreMultipartPostRequest(const char* tpath, headers_t& meta, std::s
requestHeaders = curl_slist_sort_insert(requestHeaders, "x-amz-storage-class", GetStorageClass().c_str()); requestHeaders = curl_slist_sort_insert(requestHeaders, "x-amz-storage-class", GetStorageClass().c_str());
} }
// SSE // SSE
if(!is_copy){ if(need_sse_head){
std::string ssevalue; std::string ssevalue;
if(!AddSseRequestHead(S3fsCurl::GetSseType(), ssevalue, false, false)){ if(!AddSseRequestHead(S3fsCurl::GetSseType(), ssevalue, false, false)){
S3FS_PRN_WARN("Failed to set SSE header, but continue..."); S3FS_PRN_WARN("Failed to set SSE header, but continue...");