RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-19 17:08:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23652 from theanalyst/rgw/awsv4/presign-slashes

Browse Source 
rgw: s3: awsv4 drop special handling for x-amz-credential

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
This commit is contained in:
Yuri Weinstein 2018-11-16 08:06:23 -08:00 committed by GitHub
commit f9df042c97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/rgw/rgw_auth_s3.cc
View File

@ -503,14 +503,10 @@ std::string get_v4_canonical_qs(const req_info& info, const bool using_qs)
continue;
}
if (key == "X-Amz-Credential") {
/* FIXME(rzarzynski): I can't find any comment in the previously linked
* Amazon's docs saying that X-Amz-Credential should be handled in this
* way. */
canonical_qs_map[key.to_string()] = val.to_string();
} else {
canonical_qs_map[aws4_uri_recode(key, true)] = aws4_uri_recode(val, true);
}
// while awsv4 specs ask for all slashes to be encoded, s3 itself is relaxed
// in its implementation allowing non-url-encoded slashes to be present in
// presigned urls for instance
canonical_qs_map[aws4_uri_recode(key, true)] = aws4_uri_recode(val, true);
}
/* Thanks to the early exist we have the guarantee that canonical_qs_map has