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

Avoid buffering entire input when hashing 

Also ensure that we close the InputStream.
This commit is contained in:
Andrew Gaul 2014-06-13 13:50:42 -07:00
parent 7312486a57
commit 2e5a8972f0
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
apis/glacier/src/main/java/org/jclouds/glacier/util/AWSRequestSignerV4.java
View File

@ -37,8 +37,11 @@ import com.google.common.collect.Multimap;
import com.google.common.collect.SortedSetMultimap;
import com.google.common.collect.TreeMultimap;
import com.google.common.hash.Hashing;
import com.google.common.hash.HashingInputStream;
import com.google.common.io.BaseEncoding;
import com.google.common.io.ByteSource;
import com.google.common.io.ByteStreams;
import com.google.common.io.Closeables;
import com.google.common.net.HttpHeaders;
// TODO: Query parameters, not necessary for Glacier
@ -69,8 +72,18 @@ public class AWSRequestSignerV4 {
private static String buildHashedCanonicalRequest(String method, String endpoint, String hashedPayload,
String canonicalizedHeadersString, String signedHeaders) {
return sha256((method + "\n" + endpoint + "\n" + "" + "\n" + canonicalizedHeadersString + "\n" + signedHeaders
+ "\n" + hashedPayload).getBytes());
return Hashing.sha256().newHasher()
.putString(method, UTF_8)
.putString("\n", UTF_8)
.putString(endpoint, UTF_8)
.putString("\n", UTF_8)
.putString("\n", UTF_8)
.putString(canonicalizedHeadersString, UTF_8)
.putString("\n", UTF_8)
.putString(signedHeaders, UTF_8)
.putString("\n", UTF_8)
.putString(hashedPayload, UTF_8)
.hash().toString();
}
private static String createStringToSign(String date, String credentialScope, String hashedCanonicalRequest) {
@ -120,17 +133,17 @@ public class AWSRequestSignerV4 {
}));
}
private static String sha256(byte[] unhashedBytes) {
return Hashing.sha256().hashBytes(unhashedBytes).toString();
}
private static String buildHashedPayload(HttpRequest request) {
HashingInputStream his = null;
try {
byte[] unhashedBytes = request.getPayload() == null ? "".getBytes() : ByteStreams.toByteArray(request
.getPayload().getInput());
return sha256(unhashedBytes);
his = new HashingInputStream(Hashing.sha256(),
request.getPayload() == null ? ByteSource.empty().openStream() : request.getPayload().openStream());
ByteStreams.copy(his, ByteStreams.nullOutputStream());
return his.hash().toString();
} catch (IOException e) {
throw new HttpException("Error signing request", e);
} finally {
Closeables.closeQuietly(his);
}
}