octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2024-12-23 09:18:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #585 from ggtakec/master

Browse Source 
Fixed failure to upload/copy with SSE_C and SSE_KMS
This commit is contained in:
Takeshi Nakatani 2017-05-07 18:56:17 +09:00 committed by GitHub
commit 107757f11d
1 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/curl.cpp
View File

@ -2590,12 +2590,12 @@ 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-copy-source"){ }else if(key == "x-amz-copy-source"){
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"){ }else if(key == "x-amz-server-side-encryption" && value != "aws:kms"){
// Only copy mode. // Only copy mode.
if(is_copy && !AddSseRequestHead(SSE_S3, value, false, true)){ if(is_copy && !AddSseRequestHead(SSE_S3, value, false, true)){
S3FS_PRN_WARN("Failed to insert SSE-S3 header."); S3FS_PRN_WARN("Failed to insert SSE-S3 header.");
} }
}else if(key == "x-amz-server-side-encryption-customer-algorithm"){ }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_KMS, value, false, true)){ if(is_copy && !value.empty() && !AddSseRequestHead(SSE_KMS, value, false, true)){
S3FS_PRN_WARN("Failed to insert SSE-KMS header."); S3FS_PRN_WARN("Failed to insert SSE-KMS header.");
@ -2742,9 +2742,9 @@ int S3fsCurl::PutRequest(const char* tpath, headers_t& meta, int fd)
// not set value, but after set it. // not set value, but after set it.
}else if(key.substr(0, 10) == "x-amz-meta"){ }else if(key.substr(0, 10) == "x-amz-meta"){
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"){ }else if(key == "x-amz-server-side-encryption" && value != "aws:kms"){
// 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-algorithm"){ }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"){
// skip this header, because this header is specified after logic. // skip this header, because this header is specified after logic.
@ -3045,12 +3045,12 @@ int S3fsCurl::PreMultipartPostRequest(const char* tpath, headers_t& meta, string
// not set value, but after set it. // not set value, but after set it.
}else if(key.substr(0, 10) == "x-amz-meta"){ }else if(key.substr(0, 10) == "x-amz-meta"){
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"){ }else if(key == "x-amz-server-side-encryption" && value != "aws:kms"){
// Only copy mode. // Only copy mode.
if(is_copy && !AddSseRequestHead(SSE_S3, value, false, true)){ if(is_copy && !AddSseRequestHead(SSE_S3, value, false, true)){
S3FS_PRN_WARN("Failed to insert SSE-S3 header."); S3FS_PRN_WARN("Failed to insert SSE-S3 header.");
} }
}else if(key == "x-amz-server-side-encryption-customer-algorithm"){ }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_KMS, value, false, true)){ if(is_copy && !value.empty() && !AddSseRequestHead(SSE_KMS, value, false, true)){
S3FS_PRN_WARN("Failed to insert SSE-KMS header."); S3FS_PRN_WARN("Failed to insert SSE-KMS header.");
@ -3392,6 +3392,14 @@ int S3fsCurl::UploadMultipartPostSetup(const char* tpath, int part_num, const st
headdata = new BodyData(); headdata = new BodyData();
responseHeaders.clear(); responseHeaders.clear();
// SSE
if(SSE_C == S3fsCurl::GetSseType()){
string ssevalue("");
if(!AddSseRequestHead(S3fsCurl::GetSseType(), ssevalue, false, false)){
S3FS_PRN_WARN("Failed to set SSE header, but continue...");
}
}
if(!S3fsCurl::is_sigv4){ if(!S3fsCurl::is_sigv4){
string date = get_date_rfc850(); string date = get_date_rfc850();
requestHeaders = curl_slist_sort_insert(requestHeaders, "Date", date.c_str()); requestHeaders = curl_slist_sort_insert(requestHeaders, "Date", date.c_str());
@ -3572,9 +3580,18 @@ bool S3fsCurl::UploadMultipartPostComplete()
if (it == responseHeaders.end()) { if (it == responseHeaders.end()) {
return false; return false;
} }
// check etag(md5); // check etag(md5);
if(S3fsCurl::is_content_md5 && !etag_equals(it->second, partdata.etag)){ //
return false; // The ETAG when using SSE_C and SSE_KMS does not reflect the MD5 we sent
// SSE_C: http://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectPUT.html
// SSE_KMS is ignored in the above, but in the following it states the same in the highlights:
// http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingKMSEncryption.html
//
if(S3fsCurl::is_content_md5 && SSE_C != S3fsCurl::GetSseType() && SSE_KMS != S3fsCurl::GetSseType()){
if(!etag_equals(it->second, partdata.etag)){
return false;
}
} }
partdata.etaglist->at(partdata.etagpos).assign(it->second); partdata.etaglist->at(partdata.etagpos).assign(it->second);
partdata.uploaded = true; partdata.uploaded = true;