Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

JCLOUDS-766: Fix issues with chunked upload signer 

Previously we created a new builder instead of using the one the
method modified and did not preserve content encoding.  Addresses
AWSS3BlobIntegrationLiveTest.testPutInputStream test failures.
This commit is contained in:
Andrew Gaul 2016-03-20 13:55:17 -07:00
parent 8053abb530
commit 6e7801ad58
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apis/s3/src/main/java/org/jclouds/s3/filters/Aws4SignerForChunkedUpload.java
View File

@ -112,8 +112,13 @@ public class Aws4SignerForChunkedUpload extends Aws4SignerBase {
ImmutableMap.Builder<String, String> signedHeadersBuilder = ImmutableSortedMap.<String, String>naturalOrder();
// content-encoding
requestBuilder.replaceHeader(HttpHeaders.CONTENT_ENCODING, CONTENT_ENCODING_HEADER_AWS_CHUNKED);
signedHeadersBuilder.put(HttpHeaders.CONTENT_ENCODING.toLowerCase(), CONTENT_ENCODING_HEADER_AWS_CHUNKED);
String contentEncoding = CONTENT_ENCODING_HEADER_AWS_CHUNKED;
String originalContentEncoding = payload.getContentMetadata().getContentEncoding();
if (originalContentEncoding != null) {
contentEncoding += "," + originalContentEncoding;
}
requestBuilder.replaceHeader(HttpHeaders.CONTENT_ENCODING, contentEncoding);
signedHeadersBuilder.put(HttpHeaders.CONTENT_ENCODING.toLowerCase(), contentEncoding);
// x-amz-decoded-content-length
@ -213,8 +218,9 @@ public class Aws4SignerForChunkedUpload extends Aws4SignerBase {
// replace request payload with chunked upload payload
ChunkedUploadPayload chunkedPayload = new ChunkedUploadPayload(payload, userDataBlockSize, timestamp,
credentialScope, hmacSHA256, signature);
chunkedPayload.getContentMetadata().setContentEncoding(null);
return request.toBuilder()
return requestBuilder
.replaceHeader(HttpHeaders.AUTHORIZATION, authorization.toString())
.payload(chunkedPayload)
.build();