diff options
author | Marcus Watts <mwatts@redhat.com> | 2017-06-28 10:03:39 +0200 |
---|---|---|
committer | Marcus Watts <mwatts@redhat.com> | 2017-06-28 10:03:39 +0200 |
commit | 82a7aa9e3eabfde4a82046d78aad2dadbfc0d8e1 (patch) | |
tree | 0444d5c481781f6bf2971b0c7afeddc4e022607e /src/rgw/rgw_auth_s3.h | |
parent | Merge pull request #15333 from mikulely/validate-bucket-location (diff) | |
download | ceph-82a7aa9e3eabfde4a82046d78aad2dadbfc0d8e1.tar.xz ceph-82a7aa9e3eabfde4a82046d78aad2dadbfc0d8e1.zip |
Fix s3 object uploads with chunked transfers and v4 signatures.
With aws-sdk-java 1.11, large uploads use chunked transfer by default,
and v4 signatures are the default. The java sdk uses a slightly different
string "AWS4-HMAC-SHA256-PAYLOAD" when constructing the per-chunk signature
than ceph was using. This same string also appears in a current
copy of s3-api.pdf , so it must be the more correct value.
Fixes: http://tracker.ceph.com/issues/20447
Signed-off-by: Marcus Watts <mwatts@redhat.com>
Diffstat (limited to 'src/rgw/rgw_auth_s3.h')
-rw-r--r-- | src/rgw/rgw_auth_s3.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/rgw/rgw_auth_s3.h b/src/rgw/rgw_auth_s3.h index b5fc2919213..97caf802736 100644 --- a/src/rgw/rgw_auth_s3.h +++ b/src/rgw/rgw_auth_s3.h @@ -316,6 +316,7 @@ namespace auth { namespace s3 { static constexpr char AWS4_HMAC_SHA256_STR[] = "AWS4-HMAC-SHA256"; +static constexpr char AWS4_HMAC_SHA256_PAYLOAD_STR[] = "AWS4-HMAC-SHA256-PAYLOAD"; static constexpr char AWS4_EMPTY_PAYLOAD_HASH[] = \ "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"; |