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

Handle s3fs_get_content_md5 and s3fs_sha256_hex_fd errors (#1534)

Browse Source 
Follows on to 4d833a4fb9ffc70cf5ba399e08390417423901ae.
This commit is contained in:
Andrew Gaul 2021-01-25 19:08:14 +09:00 committed by GitHub
parent 1987bcbea3
commit 17fda89ae9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/curl.cpp
View File

@ -2595,6 +2595,11 @@ void S3fsCurl::insertV4Headers()
break; break;
} }
if(0 == payload_hash.length()){
S3FS_PRN_ERR("Failed to make SHA256.");
// TODO: propagate error
}
S3FS_PRN_INFO3("computing signature [%s] [%s] [%s] [%s]", op.c_str(), server_path.c_str(), query_string.c_str(), payload_hash.c_str()); S3FS_PRN_INFO3("computing signature [%s] [%s] [%s] [%s]", op.c_str(), server_path.c_str(), query_string.c_str(), payload_hash.c_str());
std::string strdate; std::string strdate;
std::string date8601; std::string date8601;
@ -3165,6 +3170,10 @@ int S3fsCurl::PutRequest(const char* tpath, headers_t& meta, int fd)
std::string strMD5; std::string strMD5;
if(-1 != fd && S3fsCurl::is_content_md5){ if(-1 != fd && S3fsCurl::is_content_md5){
strMD5 = s3fs_get_content_md5(fd); strMD5 = s3fs_get_content_md5(fd);
if(0 == strMD5.length()){
S3FS_PRN_ERR("Failed to make MD5.");
return -EIO;
}
requestHeaders = curl_slist_sort_insert(requestHeaders, "Content-MD5", strMD5.c_str()); requestHeaders = curl_slist_sort_insert(requestHeaders, "Content-MD5", strMD5.c_str());
} }