octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2024-11-13 07:56:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #944 from gaul/utility-mode

Browse Source 
Repair utility mode
This commit is contained in:
Takeshi Nakatani 2019-02-03 13:59:56 +09:00 committed by GitHub
commit 53337a0a28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/curl.cpp
View File

@ -2483,7 +2483,7 @@ void S3fsCurl::insertV4Headers()
requestHeaders = curl_slist_sort_insert(requestHeaders, "x-amz-date", date8601.c_str());
if(!S3fsCurl::IsPublicBucket()){
string Signature = CalcSignature(op, realpath, query_string + (type == REQTYPE_PREMULTIPOST ? "=" : ""), strdate, contentSHA256, date8601);
string Signature = CalcSignature(op, realpath, query_string + (type == REQTYPE_PREMULTIPOST || type == REQTYPE_MULTILIST ? "=" : ""), strdate, contentSHA256, date8601);
string auth = "AWS4-HMAC-SHA256 Credential=" + AWSAccessKeyId + "/" + strdate + "/" + endpoint +
"/s3/aws4_request, SignedHeaders=" + get_sorted_header_keys(requestHeaders) + ", Signature=" + Signature;
requestHeaders = curl_slist_sort_insert(requestHeaders, "Authorization", auth.c_str());
@ -3416,7 +3416,8 @@ int S3fsCurl::MultipartListRequest(string& body)
path = get_realpath("/");
MakeUrlResource(path.c_str(), resource, turl);
turl += "?uploads";
query_string = "uploads";
turl += "?" + query_string;
url = prepare_url(turl.c_str());
requestHeaders = NULL;
responseHeaders.clear();
@ -3461,7 +3462,8 @@ int S3fsCurl::AbortMultipartUpload(const char* tpath, string& upload_id)
string turl;
MakeUrlResource(get_realpath(tpath).c_str(), resource, turl);
turl += "?uploadId=" + upload_id;
query_string = "uploadId=" + upload_id;
turl += "?" + query_string;
url = prepare_url(turl.c_str());
path = get_realpath(tpath);
requestHeaders = NULL;

5
src/s3fs.cpp
View File

@ -3684,11 +3684,6 @@ static int s3fs_utility_mode()
}
}
// Destroy curl
if(!S3fsCurl::DestroyS3fsCurl()){
S3FS_PRN_WARN("Could not release curl library.");
}
// ssl
s3fs_destroy_global_ssl();