octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2025-02-02 18:48:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Insert SSE headers when appropriate (#2228)

Browse Source 
References #2218.  References #2227.
This commit is contained in:
Andrew Gaul 2023-07-23 16:17:34 +09:00 committed by GitHub
parent 5371cd1468
commit 2405706643
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/curl.cpp
View File

@ -3839,12 +3839,7 @@ int S3fsCurl::PreMultipartPostRequest(const char* tpath, headers_t& meta, std::s
}else if(key == "x-amz-server-side-encryption-aws-kms-key-id"){ }else if(key == "x-amz-server-side-encryption-aws-kms-key-id"){
// skip this header, because this header is specified after logic. // skip this header, because this header is specified after logic.
}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. // skip this header, because this header is specified after logic.
if(is_copy){
if(!AddSseRequestHead(sse_type_t::SSE_C, value, true)){
S3FS_PRN_WARN("Failed to insert SSE-C header.");
}
}
} }
} }
// "x-amz-acl", storage class, sse // "x-amz-acl", storage class, sse
@ -3965,6 +3960,13 @@ int S3fsCurl::CompleteMultipartPostRequest(const char* tpath, const std::string&
requestHeaders = curl_slist_sort_insert(requestHeaders, "Accept", NULL); requestHeaders = curl_slist_sort_insert(requestHeaders, "Accept", NULL);
requestHeaders = curl_slist_sort_insert(requestHeaders, "Content-Type", contype.c_str()); requestHeaders = curl_slist_sort_insert(requestHeaders, "Content-Type", contype.c_str());
if(sse_type_t::SSE_C == S3fsCurl::GetSseType()){
std::string ssevalue;
if(!AddSseRequestHead(S3fsCurl::GetSseType(), ssevalue, false)){
S3FS_PRN_WARN("Failed to set SSE header, but continue...");
}
}
op = "POST"; op = "POST";
type = REQTYPE_COMPLETEMULTIPOST; type = REQTYPE_COMPLETEMULTIPOST;