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

refactored encryption service and exposed sha256 routine

This commit is contained in:
Adrian Cole 2010-07-06 18:21:11 -07:00
parent 2dda46696a
commit 204c093753
49 changed files with 374 additions and 588 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
atmos/src/main/java/org/jclouds/atmosonline/saas/binders/BindAtmosObjectToPayloadAndMetadataToHeaders.java
View File

@ -53,7 +53,7 @@ public class BindAtmosObjectToPayloadAndMetadataToHeaders implements Binder {
if (object.getContentMetadata().getContentMD5() != null) {
request.getHeaders().put("Content-MD5",
encryptionService.toBase64String(object.getContentMetadata().getContentMD5()));
encryptionService.base64(object.getContentMetadata().getContentMD5()));
}
metaBinder.bindToRequest(request, object.getUserMetadata());
}

4
atmos/src/main/java/org/jclouds/atmosonline/saas/filters/SignRequest.java
View File

@ -77,7 +77,7 @@ public class SignRequest implements HttpRequestFilter {
@TimeStamp Provider<String> timeStampProvider, EncryptionService encryptionService) {
this.signatureWire = signatureWire;
this.uid = uid;
this.key = encryptionService.fromBase64String(encodedKey);
this.key = encryptionService.fromBase64(encodedKey);
this.timeStampProvider = timeStampProvider;
this.encryptionService = encryptionService;
}
@ -119,7 +119,7 @@ public class SignRequest implements HttpRequestFilter {
public String signString(String toSign) {
String signature;
try {
signature = encryptionService.hmacSha1Base64(toSign, key);
signature = encryptionService.base64(encryptionService.hmacSha1(toSign, key));
} catch (Exception e) {
throw new HttpException("error signing request", e);
}

2
atmos/src/main/java/org/jclouds/atmosonline/saas/functions/ParseSystemMetadataFromHeaders.java
View File

@ -60,7 +60,7 @@ public class ParseSystemMetadataFromHeaders implements Function<HttpResponse, Sy
metaMap.put(entrySplit[0], entrySplit[1]);
}
assert metaMap.size() >= 12 : String.format("Should be 12 entries in %s", metaMap);
byte[] md5 = metaMap.containsKey("content-md5") ? encryptionService.fromHexString(metaMap
byte[] md5 = metaMap.containsKey("content-md5") ? encryptionService.fromHex(metaMap
.get("content-md5")) : null;
return new SystemMetadata(md5, dateService.iso8601SecondsDateParse(checkNotNull(metaMap
.get("atime"), "atime")), dateService.iso8601SecondsDateParse(checkNotNull(metaMap

2
atmos/src/main/java/org/jclouds/atmosonline/saas/util/AtmosStorageUtils.java
View File

@ -73,7 +73,7 @@ public class AtmosStorageUtils {
deleteAndEnsureGone(sync, path);
if (blob.getMetadata().getContentMD5() != null)
blob.getMetadata().getUserMetadata().put("content-md5",
encryptionService.toHexString(blob.getMetadata().getContentMD5()));
encryptionService.hex(blob.getMetadata().getContentMD5()));
sync.createFile(container, blob2Object.apply(blob));
return path;
}

2
atmos/src/test/java/org/jclouds/atmosonline/saas/functions/ParseSystemMetadataFromHeadersTest.java
View File

@ -55,7 +55,7 @@ public class ParseSystemMetadataFromHeadersTest {
+ "gid=rootr, objectid=4980cdb2b010109b04a44f7bb83f5f04ad354c638ae5, "
+ "objname=e913e09366364e9ba384b8fead643d43, size=4096, nlink=1, policyname=default");
SystemMetadata expected = new SystemMetadata(encryptionService
.fromHexString("1f3870be274f6c49b3e31a0c6728957f"),
.fromHex("1f3870be274f6c49b3e31a0c6728957f"),
dateService.iso8601SecondsDateParse("2009-10-12T16:09:42Z"), dateService
.iso8601SecondsDateParse("2009-10-19T04:37:00Z"), "rootr", dateService

2
aws/core/src/main/java/org/jclouds/aws/ec2/functions/ConvertUnencodedBytesToBase64EncodedString.java
View File

@ -47,6 +47,6 @@ public class ConvertUnencodedBytesToBase64EncodedString implements Function<Obje
byte[] unencodedData = (byte[]) from;
checkArgument(checkNotNull(unencodedData, "unencodedData").length <= 16 * 1024,
"userData cannot be larger than 16kb");
return encryptionService.toBase64String(unencodedData);
return encryptionService.base64(unencodedData);
}
}

2
aws/core/src/main/java/org/jclouds/aws/ec2/xml/UnencodeStringValueHandler.java
View File

@ -37,7 +37,7 @@ public class UnencodeStringValueHandler extends StringValueHandler {
@Override
public String getResult() {
return super.getResult() == null ? null : new String(encryptionService.fromBase64String(super
return super.getResult() == null ? null : new String(encryptionService.fromBase64(super
.getResult()), Charsets.UTF_8);
}
}

3
aws/core/src/main/java/org/jclouds/aws/filters/FormSigner.java
View File

@ -151,7 +151,8 @@ public class FormSigner implements HttpRequestFilter, RequestSigner {
public String sign(String stringToSign) {
String signature;
try {
signature = encryptionService.hmacSha256Base64(stringToSign, secretKey.getBytes());
signature = encryptionService.base64(encryptionService.hmacSha256(stringToSign,
secretKey.getBytes()));
if (signatureWire.enabled())
signatureWire.input(Utils.toInputStream(signature));
} catch (Exception e) {

3
aws/core/src/main/java/org/jclouds/aws/s3/filters/RequestAuthorizeSignature.java
View File

@ -128,7 +128,8 @@ public class RequestAuthorizeSignature implements HttpRequestFilter, RequestSign
public String sign(String toSign) {
String signature;
try {
signature = encryptionService.hmacSha1Base64(toSign, secretKey.getBytes());
signature = encryptionService.base64(encryptionService.hmacSha1(toSign, secretKey
.getBytes()));
} catch (Exception e) {
throw new HttpException("error signing request", e);
}

2
aws/core/src/main/java/org/jclouds/aws/s3/functions/ParseObjectMetadataFromHeaders.java
View File

@ -64,7 +64,7 @@ public class ParseObjectMetadataFromHeaders implements
BlobMetadata base = blobMetadataParser.apply(from);
MutableObjectMetadata to = blobToObjectMetadata.apply(base);
addETagTo(from, to);
to.setContentMD5(encryptionService.fromHexString(Utils.replaceAll(to.getETag(), '"', "")));
to.setContentMD5(encryptionService.fromHex(Utils.replaceAll(to.getETag(), '"', "")));
to.setCacheControl(from.getFirstHeaderOrNull(HttpHeaders.CACHE_CONTROL));
to.setContentDisposition(from.getFirstHeaderOrNull("Content-Disposition"));
to.setContentEncoding(from.getFirstHeaderOrNull(HttpHeaders.CONTENT_ENCODING));

6
aws/core/src/main/java/org/jclouds/aws/s3/xml/ListBucketHandler.java
View File

@ -72,8 +72,8 @@ public class ListBucketHandler extends ParseSax.HandlerWithResult<ListBucketResp
}
public ListBucketResponse getResult() {
return new ListBucketResponseImpl(bucketName, contents, prefix, marker, nextMarker, maxResults,
delimiter, isTruncated, commonPrefixes);
return new ListBucketResponseImpl(bucketName, contents, prefix, marker, nextMarker,
maxResults, delimiter, isTruncated, commonPrefixes);
}
private boolean inCommonPrefixes;
@ -102,7 +102,7 @@ public class ListBucketHandler extends ParseSax.HandlerWithResult<ListBucketResp
currentLastModified = dateParser.iso8601DateParse(currentText.toString().trim());
} else if (qName.equals("ETag")) {
currentETag = currentText.toString().trim();
currentMD5 = encryptionService.fromHexString(Utils.replaceAll(currentETag,'"', ""));
currentMD5 = encryptionService.fromHex(Utils.replaceAll(currentETag, '"', ""));
} else if (qName.equals("Size")) {
currentSize = new Long(currentText.toString().trim());
} else if (qName.equals("Owner")) {

2
aws/core/src/main/java/org/jclouds/aws/sqs/xml/MD5Handler.java
View File

@ -48,7 +48,7 @@ public class MD5Handler extends ParseSax.HandlerWithResult<byte[]> {
public void endElement(String uri, String name, String qName) {
if (qName.equals("MD5OfMessageBody")) {
String md5Hex = currentText.toString().trim();
this.md5 = encryptionService.fromHexString(md5Hex);
this.md5 = encryptionService.fromHex(md5Hex);
}
currentText = new StringBuilder();
}

2
aws/core/src/main/java/org/jclouds/aws/sqs/xml/RegexMD5Handler.java
View File

@ -54,7 +54,7 @@ public class RegexMD5Handler implements Function<HttpResponse, byte[]> {
try {
Matcher matcher = pattern.matcher(Utils.toStringAndClose(response.getContent()));
if (matcher.find()) {
value = encryptionService.fromHexString(matcher.group(1));
value = encryptionService.fromHex(matcher.group(1));
}
} catch (IOException e) {
Throwables.propagate(e);

2
aws/core/src/test/java/org/jclouds/aws/s3/functions/ParseObjectMetadataFromHeadersTest.java
View File

@ -104,7 +104,7 @@ public class ParseObjectMetadataFromHeadersTest {
expects.setCacheControl("cacheControl");
expects.setContentDisposition("contentDisposition");
expects.setContentEncoding("encoding");
expects.setContentMD5(encryptionService.fromHexString("abc"));
expects.setContentMD5(encryptionService.fromHex("abc"));
expects.setContentType("type");
expects.setETag("\"abc\"");
expects.setKey("key");

42
aws/core/src/test/java/org/jclouds/aws/s3/xml/ListBucketHandlerTest.java
View File

@ -65,54 +65,54 @@ public class ListBucketHandlerTest extends BaseHandlerTest {
(ObjectMetadata) new BucketListObjectMetadata("apps/0", dateService
.iso8601DateParse("2009-05-07T18:27:08.000Z"),
"\"c82e6a0025c31c5de5947fda62ac51ab\"", encryptionService
.fromHexString("c82e6a0025c31c5de5947fda62ac51ab"), 8,
owner, StorageClass.STANDARD),
.fromHex("c82e6a0025c31c5de5947fda62ac51ab"), 8, owner,
StorageClass.STANDARD),
(ObjectMetadata) new BucketListObjectMetadata("apps/1", dateService
.iso8601DateParse("2009-05-07T18:27:09.000Z"),
"\"944fab2c5a9a6bacf07db5e688310d7a\"", encryptionService
.fromHexString("944fab2c5a9a6bacf07db5e688310d7a"), 8,
owner, StorageClass.STANDARD),
.fromHex("944fab2c5a9a6bacf07db5e688310d7a"), 8, owner,
StorageClass.STANDARD),
(ObjectMetadata) new BucketListObjectMetadata("apps/2", dateService
.iso8601DateParse("2009-05-07T18:27:09.000Z"),
"\"a227b8888045c8fd159fb495214000f0\"", encryptionService
.fromHexString("a227b8888045c8fd159fb495214000f0"), 8,
owner, StorageClass.STANDARD),
.fromHex("a227b8888045c8fd159fb495214000f0"), 8, owner,
StorageClass.STANDARD),
(ObjectMetadata) new BucketListObjectMetadata("apps/3", dateService
.iso8601DateParse("2009-05-07T18:27:09.000Z"),
"\"c9caa76c3dec53e2a192608ce73eef03\"", encryptionService
.fromHexString("c9caa76c3dec53e2a192608ce73eef03"), 8,
owner, StorageClass.STANDARD),
.fromHex("c9caa76c3dec53e2a192608ce73eef03"), 8, owner,
StorageClass.STANDARD),
(ObjectMetadata) new BucketListObjectMetadata("apps/4", dateService
.iso8601DateParse("2009-05-07T18:27:09.000Z"),
"\"1ce5d0dcc6154a647ea90c7bdf82a224\"", encryptionService
.fromHexString("1ce5d0dcc6154a647ea90c7bdf82a224"), 8,
owner, StorageClass.STANDARD),
.fromHex("1ce5d0dcc6154a647ea90c7bdf82a224"), 8, owner,
StorageClass.STANDARD),
(ObjectMetadata) new BucketListObjectMetadata("apps/5", dateService
.iso8601DateParse("2009-05-07T18:27:09.000Z"),
"\"79433524d87462ee05708a8ef894ed55\"", encryptionService
.fromHexString("79433524d87462ee05708a8ef894ed55"), 8,
owner, StorageClass.STANDARD),
.fromHex("79433524d87462ee05708a8ef894ed55"), 8, owner,
StorageClass.STANDARD),
(ObjectMetadata) new BucketListObjectMetadata("apps/6", dateService
.iso8601DateParse("2009-05-07T18:27:10.000Z"),
"\"dd00a060b28ddca8bc5a21a49e306f67\"", encryptionService
.fromHexString("dd00a060b28ddca8bc5a21a49e306f67"), 8,
owner, StorageClass.STANDARD),
.fromHex("dd00a060b28ddca8bc5a21a49e306f67"), 8, owner,
StorageClass.STANDARD),
(ObjectMetadata) new BucketListObjectMetadata("apps/7", dateService
.iso8601DateParse("2009-05-07T18:27:10.000Z"),
"\"8cd06eca6e819a927b07a285d750b100\"", encryptionService
.fromHexString("8cd06eca6e819a927b07a285d750b100"), 8,
owner, StorageClass.STANDARD),
.fromHex("8cd06eca6e819a927b07a285d750b100"), 8, owner,
StorageClass.STANDARD),
(ObjectMetadata) new BucketListObjectMetadata("apps/8", dateService
.iso8601DateParse("2009-05-07T18:27:10.000Z"),
"\"174495094d0633b92cbe46603eee6bad\"", encryptionService
.fromHexString("174495094d0633b92cbe46603eee6bad"), 8,
owner, StorageClass.STANDARD),
.fromHex("174495094d0633b92cbe46603eee6bad"), 8, owner,
StorageClass.STANDARD),
(ObjectMetadata) new BucketListObjectMetadata("apps/9", dateService
.iso8601DateParse("2009-05-07T18:27:10.000Z"),
"\"cd8a19b26fea8a827276df0ad11c580d\"", encryptionService
.fromHexString("cd8a19b26fea8a827276df0ad11c580d"), 8,
owner, StorageClass.STANDARD)), "apps/", null, null, 1000, null,
false, new TreeSet<String>());
.fromHex("cd8a19b26fea8a827276df0ad11c580d"), 8, owner,
StorageClass.STANDARD)), "apps/", null, null, 1000, null, false,
new TreeSet<String>());
ListBucketResponse result = (ListBucketResponse) factory.create(
injector.getInstance(ListBucketHandler.class)).parse(is);

9
aws/core/src/test/java/org/jclouds/aws/sqs/SQSClientLiveTest.java
View File

@ -35,6 +35,7 @@ import org.jclouds.encryption.internal.JCEEncryptionService;
import org.jclouds.logging.log4j.config.Log4JLoggingModule;
import org.jclouds.rest.RestContext;
import org.jclouds.rest.RestContextFactory;
import org.jclouds.util.Utils;
import org.testng.annotations.AfterTest;
import org.testng.annotations.BeforeGroups;
import org.testng.annotations.Test;
@ -61,8 +62,10 @@ public class SQSClientLiveTest {
@BeforeGroups(groups = { "live" })
public void setupClient() throws IOException {
String identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity");
String credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential");
String identity = checkNotNull(System.getProperty("jclouds.test.identity"),
"jclouds.test.identity");
String credential = checkNotNull(System.getProperty("jclouds.test.credential"),
"jclouds.test.credential");
context = new RestContextFactory().createContext("sqs", identity, credential, ImmutableSet
.<Module> of(new Log4JLoggingModule()));
@ -126,7 +129,7 @@ public class SQSClientLiveTest {
@Test(dependsOnMethods = "testCreateQueue")
void testSendMessage() throws InterruptedException {
String message = "hardyharhar";
byte[] md5 = encryptionService.md5(message.getBytes());
byte[] md5 = encryptionService.md5(Utils.toInputStream(message));
for (Queue queue : queues) {
assertEquals(client.sendMessage(queue, message), md5);
}

2
azure/src/main/java/org/jclouds/azure/storage/blob/binders/BindAzureBlobToPayload.java
View File

@ -78,7 +78,7 @@ public class BindAzureBlobToPayload implements Binder {
if (object.getProperties().getContentMD5() != null) {
request.getHeaders().put("Content-MD5",
encryptionService.toBase64String(object.getProperties().getContentMD5()));
encryptionService.base64(object.getProperties().getContentMD5()));
}
if (object.getProperties().getContentLanguage() != null) {
request.getHeaders().put(HttpHeaders.CONTENT_LANGUAGE,

2
azure/src/main/java/org/jclouds/azure/storage/blob/xml/ContainerNameEnumerationResultsHandler.java
View File

@ -166,7 +166,7 @@ public class ContainerNameEnumerationResultsHandler extends
currentSize = Long.parseLong(currentText.toString().trim());
} else if (qName.equals("Content-MD5")) {
if (!currentText.toString().trim().equals(""))
currentContentMD5 = encryptionService.fromBase64String(currentText.toString().trim());
currentContentMD5 = encryptionService.fromBase64(currentText.toString().trim());
} else if (qName.equals("Content-Type")) {
currentContentType = currentText.toString().trim();
} else if (qName.equals("Content-Encoding")) {

4
azure/src/main/java/org/jclouds/azure/storage/filters/SharedKeyLiteAuthentication.java
View File

@ -74,7 +74,7 @@ public class SharedKeyLiteAuthentication implements HttpRequestFilter {
this.encryptionService = encryptionService;
this.signatureWire = signatureWire;
this.identity = identity;
this.key = encryptionService.fromBase64String(encodedKey);
this.key = encryptionService.fromBase64(encodedKey);
this.timeStampProvider = timeStampProvider;
}
@ -110,7 +110,7 @@ public class SharedKeyLiteAuthentication implements HttpRequestFilter {
public String signString(String toSign) {
String signature;
try {
signature = encryptionService.hmacSha256Base64(toSign, key);
signature = encryptionService.base64(encryptionService.hmacSha256(toSign, key));
} catch (Exception e) {
throw new HttpException("error signing request", e);
}

19
azure/src/test/java/org/jclouds/azure/storage/blob/AzureBlobClientLiveTest.java
View File

@ -74,7 +74,8 @@ public class AzureBlobClientLiveTest {
identity = System.getProperty("jclouds.test.identity");
String credential = System.getProperty("jclouds.test.credential");
client = (AzureBlobClient) new BlobStoreContextFactory().createContext("azureblob", identity,
credential, ImmutableSet.<Module> of(new Log4JLoggingModule())).getProviderSpecificContext().getApi();
credential, ImmutableSet.<Module> of(new Log4JLoggingModule()))
.getProviderSpecificContext().getApi();
}
@Test
@ -236,8 +237,8 @@ public class AzureBlobClientLiveTest {
object.getProperties().getMetadata().put("mykey", "metadata-value");
byte[] md5 = object.getProperties().getContentMD5();
String newEtag = client.putBlob(privateContainer, object);
assertEquals(encryptionService.toHexString(md5), encryptionService.toHexString(object
.getProperties().getContentMD5()));
assertEquals(encryptionService.hex(md5), encryptionService.hex(object.getProperties()
.getContentMD5()));
// Test HEAD of missing object
assert client.getBlobProperties(privateContainer, "non-existent-object") == null;
@ -254,8 +255,8 @@ public class AzureBlobClientLiveTest {
// assertEquals(metadata.getSize(), data.length());
assertEquals(metadata.getContentType(), "text/plain");
// Azure doesn't return the Content-MD5 on head request...
assertEquals(encryptionService.toHexString(md5), encryptionService.toHexString(object
.getProperties().getContentMD5()));
assertEquals(encryptionService.hex(md5), encryptionService.hex(object.getProperties()
.getContentMD5()));
assertEquals(metadata.getETag(), newEtag);
assertEquals(metadata.getMetadata().entrySet().size(), 1);
assertEquals(metadata.getMetadata().get("mykey"), "metadata-value");
@ -276,8 +277,8 @@ public class AzureBlobClientLiveTest {
// TODO assertEquals(getBlob.getName(), object.getProperties().getName());
assertEquals(getBlob.getContentLength(), new Long(data.length()));
assertEquals(getBlob.getProperties().getContentType(), "text/plain");
assertEquals(encryptionService.toHexString(md5), encryptionService.toHexString(getBlob
.getProperties().getContentMD5()));
assertEquals(encryptionService.hex(md5), encryptionService.hex(getBlob.getProperties()
.getContentMD5()));
assertEquals(newEtag, getBlob.getProperties().getETag());
// wait until we can update metadata
// assertEquals(getBlob.getProperties().getMetadata().entries().size(), 2);
@ -318,8 +319,8 @@ public class AzureBlobClientLiveTest {
object.setPayload(bais);
object.setContentLength(new Long(data.getBytes().length));
newEtag = client.putBlob(privateContainer, object);
assertEquals(encryptionService.toHexString(md5), encryptionService.toHexString(getBlob
.getProperties().getContentMD5()));
assertEquals(encryptionService.hex(md5), encryptionService.hex(getBlob.getProperties()
.getContentMD5()));
// Test GET with options
// Non-matching ETag

107
blobstore/src/main/java/org/jclouds/blobstore/TransientAsyncBlobStore.java
View File

@ -20,15 +20,26 @@ package org.jclouds.blobstore;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
import static com.google.common.base.Throwables.getCausalChain;
import static com.google.common.base.Throwables.propagate;
import static com.google.common.collect.Iterables.filter;
import static com.google.common.collect.Iterables.find;
import static com.google.common.collect.Iterables.size;
import static com.google.common.collect.Iterables.transform;
import static com.google.common.collect.Lists.newArrayList;
import static com.google.common.collect.Lists.partition;
import static com.google.common.collect.Maps.newHashMap;
import static com.google.common.collect.Sets.filter;
import static com.google.common.collect.Sets.newTreeSet;
import static com.google.common.io.ByteStreams.toByteArray;
import static com.google.common.io.Closeables.closeQuietly;
import static com.google.common.util.concurrent.Futures.immediateFailedFuture;
import static com.google.common.util.concurrent.Futures.immediateFuture;
import static org.jclouds.http.Payloads.newByteArrayPayload;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.ObjectInput;
import java.io.ObjectInputStream;
import java.io.ObjectOutput;
@ -74,17 +85,12 @@ import org.jclouds.http.HttpCommand;
import org.jclouds.http.HttpRequest;
import org.jclouds.http.HttpResponse;
import org.jclouds.http.HttpResponseException;
import org.jclouds.http.Payload;
import org.jclouds.http.options.HttpRequestOptions;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.base.Throwables;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.google.common.io.ByteStreams;
import com.google.common.io.Closeables;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.inject.internal.Nullable;
@ -125,27 +131,6 @@ public class TransientAsyncBlobStore extends BaseAsyncBlobStore {
getContainerToBlobs().put("stub", new ConcurrentHashMap<String, Blob>());
}
/**
* @throws java.io.IOException
*/
public static byte[] toByteArray(Object data) throws IOException {
checkNotNull(data, "data must be set before calling generateETag()");
byte[] bytes = null;
if (data == null || data instanceof byte[]) {
bytes = (byte[]) data;
} else if (data instanceof String) {
bytes = ((String) data).getBytes();
} else if (data instanceof File || data instanceof InputStream) {
InputStream io = (data instanceof InputStream) ? (InputStream) data : new FileInputStream(
(File) data);
bytes = ByteStreams.toByteArray(io);
Closeables.closeQuietly(io);
} else {
throw new UnsupportedOperationException("Content not supported " + data.getClass());
}
return bytes;
}
/**
* default maxResults is 1000
*/
@ -157,8 +142,8 @@ public class TransientAsyncBlobStore extends BaseAsyncBlobStore {
if (realContents == null)
return immediateFailedFuture(cnfe(container));
SortedSet<StorageMetadata> contents = Sets.newTreeSet(Iterables.transform(realContents
.keySet(), new Function<String, StorageMetadata>() {
SortedSet<StorageMetadata> contents = newTreeSet(transform(realContents.keySet(),
new Function<String, StorageMetadata>() {
public StorageMetadata apply(String key) {
Blob oldBlob = realContents.get(key);
checkState(oldBlob != null, "blob " + key
@ -177,8 +162,7 @@ public class TransientAsyncBlobStore extends BaseAsyncBlobStore {
if (options.getMarker() != null) {
final String finalMarker = options.getMarker();
StorageMetadata lastMarkerMetadata = Iterables.find(contents,
new Predicate<StorageMetadata>() {
StorageMetadata lastMarkerMetadata = find(contents, new Predicate<StorageMetadata>() {
public boolean apply(StorageMetadata metadata) {
return metadata.getName().equals(finalMarker);
}
@ -189,7 +173,7 @@ public class TransientAsyncBlobStore extends BaseAsyncBlobStore {
final String prefix = options.getDir();
if (prefix != null) {
contents = Sets.newTreeSet(Iterables.filter(contents, new Predicate<StorageMetadata>() {
contents = newTreeSet(filter(contents, new Predicate<StorageMetadata>() {
public boolean apply(StorageMetadata o) {
return (o != null && o.getName().startsWith(prefix) && !o.getName().equals(prefix));
}
@ -212,15 +196,15 @@ public class TransientAsyncBlobStore extends BaseAsyncBlobStore {
final String delimiter = options.isRecursive() ? null : "/";
if (delimiter != null) {
SortedSet<String> commonPrefixes = null;
Iterable<String> iterable = Iterables.transform(contents, new CommonPrefixes(
prefix != null ? prefix : null, delimiter));
commonPrefixes = iterable != null ? Sets.newTreeSet(iterable) : new TreeSet<String>();
Iterable<String> iterable = transform(contents, new CommonPrefixes(prefix != null ? prefix
: null, delimiter));
commonPrefixes = iterable != null ? newTreeSet(iterable) : new TreeSet<String>();
commonPrefixes.remove(CommonPrefixes.NO_PREFIX);
contents = Sets.newTreeSet(Iterables.filter(contents, new DelimiterFilter(
prefix != null ? prefix : null, delimiter)));
contents = newTreeSet(filter(contents, new DelimiterFilter(prefix != null ? prefix : null,
delimiter)));
Iterables.<StorageMetadata> addAll(contents, Iterables.transform(commonPrefixes,
Iterables.<StorageMetadata> addAll(contents, transform(commonPrefixes,
new Function<String, StorageMetadata>() {
public StorageMetadata apply(String o) {
MutableStorageMetadata md = new MutableStorageMetadataImpl();
@ -258,14 +242,14 @@ public class TransientAsyncBlobStore extends BaseAsyncBlobStore {
convertUserMetadataKeysToLowercase(metadata);
return metadata;
} catch (Exception e) {
Throwables.propagate(e);
propagate(e);
assert false : "exception should have propagated: " + e;
return null;
}
}
private static void convertUserMetadataKeysToLowercase(MutableBlobMetadata metadata) {
Map<String, String> lowerCaseUserMetadata = Maps.newHashMap();
Map<String, String> lowerCaseUserMetadata = newHashMap();
for (Entry<String, String> entry : metadata.getUserMetadata().entrySet()) {
lowerCaseUserMetadata.put(entry.getKey().toLowerCase(), entry.getValue());
}
@ -333,8 +317,8 @@ public class TransientAsyncBlobStore extends BaseAsyncBlobStore {
*/
@Override
public ListenableFuture<? extends PageSet<? extends StorageMetadata>> list() {
return immediateFuture(new PageSetImpl<StorageMetadata>(Iterables.transform(
getContainerToBlobs().keySet(), new Function<String, StorageMetadata>() {
return immediateFuture(new PageSetImpl<StorageMetadata>(transform(getContainerToBlobs()
.keySet(), new Function<String, StorageMetadata>() {
public StorageMetadata apply(String name) {
MutableStorageMetadata cmd = create();
cmd.setName(name);
@ -423,8 +407,8 @@ public class TransientAsyncBlobStore extends BaseAsyncBlobStore {
public static <T extends Comparable<?>> SortedSet<T> firstSliceOfSize(Iterable<T> elements,
int size) {
List<List<T>> slices = Lists.partition(Lists.newArrayList(elements), size);
return Sets.newTreeSet(slices.get(0));
List<List<T>> slices = partition(newArrayList(elements), size);
return newTreeSet(slices.get(0));
}
public static HttpResponseException returnResponseException(int code) {
@ -472,24 +456,32 @@ public class TransientAsyncBlobStore extends BaseAsyncBlobStore {
* {@inheritDoc}
*/
@Override
public ListenableFuture<String> putBlob(final String containerName, final Blob object) {
public ListenableFuture<String> putBlob(String containerName, Blob object) {
Map<String, Blob> container = getContainerToBlobs().get(containerName);
if (container == null) {
new RuntimeException("containerName not found: " + containerName);
}
Payload payload = object.getPayload();
if (!payload.isRepeatable()) {
try {
byte[] data = toByteArray(object.getPayload().getRawContent());
object.getMetadata().setSize(data.length);
payload = newByteArrayPayload(toByteArray(payload.getInput()));
} catch (IOException e) {
propagate(e);
} finally {
closeQuietly(payload.getInput());
}
}
object.getMetadata().setSize(payload.calculateSize());
MutableBlobMetadata newMd = copy(object.getMetadata());
newMd.setLastModified(new Date());
final byte[] md5 = encryptionService.md5(data);
final String eTag = encryptionService.toHexString(md5);
byte[] md5 = encryptionService.md5(payload.getInput());
String eTag = encryptionService.hex(md5);
newMd.setETag(eTag);
newMd.setContentMD5(md5);
newMd.setContentType(object.getMetadata().getContentType());
Blob blob = blobFactory.create(newMd);
blob.setPayload(data);
blob.setPayload(payload);
container.put(blob.getMetadata().getName(), blob);
// Set HTTP headers to match metadata
@ -502,10 +494,6 @@ public class TransientAsyncBlobStore extends BaseAsyncBlobStore {
blob.getAllHeaders().put(userMD.getKey(), userMD.getValue());
}
return immediateFuture(eTag);
} catch (IOException e) {
return immediateFailedFuture(new RuntimeException(e));
}
}
/**
@ -567,7 +555,7 @@ public class TransientAsyncBlobStore extends BaseAsyncBlobStore {
if (options.getRanges() != null && options.getRanges().size() > 0) {
byte[] data;
try {
data = ByteStreams.toByteArray(returnVal.getPayload().getInput());
data = toByteArray(returnVal.getPayload().getInput());
} catch (IOException e) {
return immediateFailedFuture(new RuntimeException(e));
}
@ -608,8 +596,7 @@ public class TransientAsyncBlobStore extends BaseAsyncBlobStore {
Blob blob = getBlob(container, key).get();
return immediateFuture(blob != null ? (BlobMetadata) copy(blob.getMetadata()) : null);
} catch (Exception e) {
if (Iterables.size(Iterables.filter(Throwables.getCausalChain(e),
KeyNotFoundException.class)) >= 1)
if (size(filter(getCausalChain(e), KeyNotFoundException.class)) >= 1)
return immediateFuture(null);
return immediateFailedFuture(e);
}

2
blobstore/src/main/java/org/jclouds/blobstore/binders/BindBlobToPayload.java
View File

@ -53,7 +53,7 @@ public class BindBlobToPayload implements Binder {
if (object.getMetadata().getContentMD5() != null) {
request.getHeaders().put("Content-MD5",
encryptionService.toBase64String(object.getMetadata().getContentMD5()));
encryptionService.base64(object.getMetadata().getContentMD5()));
}
}
}

33
blobstore/src/main/java/org/jclouds/blobstore/functions/GenerateMD5.java
View File

@ -1,33 +0,0 @@
/**
*
* Copyright (C) 2009 Cloud Conscious, LLC. <info@cloudconscious.com>
*
* ====================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ====================================================================
*/
package org.jclouds.blobstore.functions;
import org.jclouds.blobstore.functions.impl.JCEGenerateMD5;
import com.google.common.base.Function;
import com.google.inject.ImplementedBy;
/**
*
* @author Adrian Cole
*/
@ImplementedBy(JCEGenerateMD5.class)
public interface GenerateMD5 extends Function<Object, byte[]> {
}

36
blobstore/src/main/java/org/jclouds/blobstore/functions/GenerateMD5Result.java
View File

@ -1,36 +0,0 @@
/**
*
* Copyright (C) 2009 Cloud Conscious, LLC. <info@cloudconscious.com>
*
* ====================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ====================================================================
*/
package org.jclouds.blobstore.functions;
import java.io.InputStream;
import org.jclouds.blobstore.domain.MD5InputStreamResult;
import org.jclouds.blobstore.functions.impl.JCEGenerateMD5Result;
import com.google.common.base.Function;
import com.google.inject.ImplementedBy;
/**
*
* @author Adrian Cole
*/
@ImplementedBy(JCEGenerateMD5Result.class)
public interface GenerateMD5Result extends Function<InputStream, MD5InputStreamResult> {
}

2
blobstore/src/main/java/org/jclouds/blobstore/functions/ParseSystemAndUserMetadataFromHeaders.java
View File

@ -114,7 +114,7 @@ public class ParseSystemAndUserMetadataFromHeaders implements
protected void addContentMD5To(HttpResponse from, MutableBlobMetadata metadata) {
String contentMD5 = from.getFirstHeaderOrNull("Content-MD5");
if (contentMD5 != null) {
metadata.setContentMD5(encryptionService.fromBase64String(contentMD5));
metadata.setContentMD5(encryptionService.fromBase64(contentMD5));
}
}

39
blobstore/src/main/java/org/jclouds/blobstore/functions/impl/JCEGenerateMD5.java
View File

@ -1,39 +0,0 @@
/**
*
* Copyright (C) 2009 Cloud Conscious, LLC. <info@cloudconscious.com>
*
* ====================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ====================================================================
*/
package org.jclouds.blobstore.functions.impl;
import javax.inject.Singleton;
import org.jclouds.blobstore.functions.GenerateMD5;
import org.jclouds.encryption.EncryptionService;
import org.jclouds.encryption.internal.JCEEncryptionService;
/**
*
* @author Adrian Cole
*/
@Singleton
public class JCEGenerateMD5 implements GenerateMD5 {
private static final EncryptionService encryptionService = new JCEEncryptionService();
public byte[] apply(Object from) {
return encryptionService.md5(from);
}
}

43
blobstore/src/main/java/org/jclouds/blobstore/functions/impl/JCEGenerateMD5Result.java
View File

@ -1,43 +0,0 @@
/**
*
* Copyright (C) 2009 Cloud Conscious, LLC. <info@cloudconscious.com>
*
* ====================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ====================================================================
*/
package org.jclouds.blobstore.functions.impl;
import java.io.InputStream;
import javax.inject.Singleton;
import org.jclouds.blobstore.domain.MD5InputStreamResult;
import org.jclouds.blobstore.functions.GenerateMD5Result;
import org.jclouds.encryption.EncryptionService;
import org.jclouds.encryption.internal.JCEEncryptionService;
/**
*
* @author Adrian Cole
*/
@Singleton
public class JCEGenerateMD5Result implements GenerateMD5Result {
private static final EncryptionService encryptionService = new JCEEncryptionService();
public MD5InputStreamResult apply(InputStream toEncode) {
org.jclouds.encryption.EncryptionService.MD5InputStreamResult result = encryptionService
.generateMD5Result(toEncode);
return new MD5InputStreamResult(result.data, result.md5, result.length);
}
}

8
blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java
View File

@ -83,7 +83,7 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest {
@Override
public void setUpResourcesOnThisThread(ITestContext testContext) throws Exception {
encryptionService = Guice.createInjector().getInstance(EncryptionService.class);
MD5InputStreamResult result = encryptionService.generateMD5Result(getTestDataSupplier()
MD5InputStreamResult result = encryptionService.md5Result(getTestDataSupplier()
.getInput());
oneHundredOneConstitutions = result.data;
oneHundredOneConstitutionsMD5 = result.md5;
@ -440,7 +440,8 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest {
// NOTE all metadata in jclouds comes out as lowercase, in an effort to normalize the
// providers.
object.getMetadata().getUserMetadata().put("Adrian", "powderpuff");
object.getMetadata().setContentMD5(new JCEEncryptionService().md5(TEST_STRING.getBytes()));
object.getMetadata().setContentMD5(
new JCEEncryptionService().md5(Utils.toInputStream(TEST_STRING)));
String containerName = getContainerName();
try {
assertNull(context.getBlobStore().blobMetadata(containerName, "powderpuff"));
@ -469,7 +470,8 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest {
assert metadata.getContentType().startsWith("text/plain") : metadata.getContentType();
assertEquals(metadata.getSize(), new Long(TEST_STRING.length()));
assertEquals(metadata.getUserMetadata().get("adrian"), "powderpuff");
assertEquals(metadata.getContentMD5(), new JCEEncryptionService().md5(TEST_STRING.getBytes()));
assertEquals(metadata.getContentMD5(), new JCEEncryptionService().md5(Utils
.toInputStream(TEST_STRING)));
}
}

2
blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobLiveTest.java
View File

@ -59,7 +59,7 @@ public class BaseBlobLiveTest extends BaseBlobStoreIntegrationTest {
String key = "hello";
URL url = new URL(httpStreamUrl);
byte[] md5 = new JCEEncryptionService().fromHexString(httpStreamETag);
byte[] md5 = new JCEEncryptionService().fromHex(httpStreamETag);
URLConnection connection = url.openConnection();
int length = connection.getContentLength();

17
blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerIntegrationTest.java
View File

@ -18,9 +18,12 @@
*/
package org.jclouds.blobstore.integration.internal;
import static com.google.common.base.Throwables.propagateIfPossible;
import static com.google.common.collect.Iterables.get;
import static org.jclouds.blobstore.options.ListContainerOptions.Builder.afterMarker;
import static org.jclouds.blobstore.options.ListContainerOptions.Builder.inDirectory;
import static org.jclouds.blobstore.options.ListContainerOptions.Builder.maxResults;
import static org.jclouds.util.Utils.toInputStream;
import static org.testng.Assert.assertEquals;
import java.io.UnsupportedEncodingException;
@ -37,9 +40,6 @@ import org.jclouds.blobstore.domain.StorageMetadata;
import org.jclouds.encryption.internal.JCEEncryptionService;
import org.testng.annotations.Test;
import com.google.common.base.Throwables;
import com.google.common.collect.Iterables;
/**
* @author Adrian Cole
*/
@ -80,7 +80,8 @@ public class BaseContainerIntegrationTest extends BaseBlobStoreIntegrationTest {
// NOTE all metadata in jclouds comes out as lowercase, in an effort to normalize the
// providers.
object.getMetadata().getUserMetadata().put("Adrian", "powderpuff");
object.getMetadata().setContentMD5(new JCEEncryptionService().md5(TEST_STRING.getBytes()));
object.getMetadata()
.setContentMD5(new JCEEncryptionService().md5(toInputStream(TEST_STRING)));
String containerName = getContainerName();
try {
addBlobToContainer(containerName, object);
@ -89,13 +90,13 @@ public class BaseContainerIntegrationTest extends BaseBlobStoreIntegrationTest {
PageSet<? extends StorageMetadata> container = context.getBlobStore().list(containerName,
maxResults(1).withDetails());
BlobMetadata metadata = BlobMetadata.class.cast(Iterables.get(container, 0));
BlobMetadata metadata = BlobMetadata.class.cast(get(container, 0));
assert metadata.getContentType().startsWith("text/plain") : metadata.getContentType();
assertEquals(metadata.getSize(), new Long(TEST_STRING.length()));
assertEquals(metadata.getUserMetadata().get("adrian"), "powderpuff");
assertEquals(metadata.getContentMD5(), new JCEEncryptionService().md5(TEST_STRING
.getBytes()));
assertEquals(metadata.getContentMD5(), new JCEEncryptionService()
.md5(toInputStream(TEST_STRING)));
} finally {
returnContainer(containerName);
}
@ -304,7 +305,7 @@ public class BaseContainerIntegrationTest extends BaseBlobStoreIntegrationTest {
assert !context.getBlobStore().containerExists(containerName) : "container "
+ containerName + " still exists";
} catch (Exception e) {
Throwables.propagateIfPossible(e);
propagateIfPossible(e);
}
}
});

9
chef/src/main/java/org/jclouds/chef/filters/SignedHeaderAuth.java
View File

@ -134,7 +134,8 @@ public class SignedHeaderAuth implements HttpRequestFilter {
@VisibleForTesting
String hashPath(String path) {
try {
return encryptionService.sha1Base64(Utils.toInputStream(canonicalPath(path)));
return encryptionService.base64(encryptionService.sha1(Utils
.toInputStream(canonicalPath(path))));
} catch (Exception e) {
Throwables.propagateIfPossible(e);
throw new HttpException("error creating sigature for path: " + path, e);
@ -159,7 +160,7 @@ public class SignedHeaderAuth implements HttpRequestFilter {
checkArgument(payload != null, "payload was null");
checkArgument(payload.isRepeatable(), "payload must be repeatable: " + payload);
try {
return encryptionService.sha1Base64(payload.getInput());
return encryptionService.base64(encryptionService.sha1(payload.getInput()));
} catch (Exception e) {
Throwables.propagateIfPossible(e);
throw new HttpException("error creating sigature for payload: " + payload, e);
@ -187,8 +188,8 @@ public class SignedHeaderAuth implements HttpRequestFilter {
public String sign(String toSign) {
try {
byte[] encrypted = encryptionService.rsaPrivateEncrypt(toSign, privateKey);
return encryptionService.toBase64String(encrypted);
byte[] encrypted = encryptionService.rsaSign(toSign, privateKey);
return encryptionService.base64(encrypted);
} catch (Exception e) {
throw new HttpException("error signing request", e);
}

10
chef/src/test/java/org/jclouds/chef/ChefClientLiveTest.java
View File

@ -28,6 +28,7 @@ import static org.testng.Assert.assertNotNull;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
import java.util.Set;
@ -36,7 +37,6 @@ import org.jclouds.chef.domain.Resource;
import org.jclouds.logging.log4j.config.Log4JLoggingModule;
import org.jclouds.rest.RestContext;
import org.jclouds.rest.RestContextFactory;
import org.jclouds.util.Utils;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@ -135,7 +135,13 @@ public class ChefClientLiveTest {
cookbookO.getRecipes()).addAll(cookbookO.getResources()).addAll(
cookbookO.getRootFiles()).addAll(cookbookO.getTemplates()).build()) {
try {
Utils.toStringAndClose(adminConnection.utils().http().get(resource.getUrl()));
InputStream stream = adminConnection.utils().http().get(resource.getUrl());
byte[] md5 = adminConnection.utils().encryption().sha256(stream);
String md5Hex = adminConnection.utils().encryption().hex(md5);
assert md5Hex.equals(resource.getChecksum()) : String.format(
"hex for %s was: %s should be %s ", resource, md5Hex, resource
.getChecksum());
} catch (NullPointerException e) {
assert false : "resource not found: " + resource;
}

46
core/src/main/java/org/jclouds/encryption/EncryptionService.java
View File

@ -24,15 +24,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.io.FilterOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.security.InvalidKeyException;
import java.security.Key;
import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
import javax.crypto.BadPaddingException;
import javax.crypto.IllegalBlockSizeException;
import javax.crypto.NoSuchPaddingException;
import org.jclouds.encryption.internal.JCEEncryptionService;
@ -44,35 +36,27 @@ import com.google.inject.ImplementedBy;
*/
@ImplementedBy(JCEEncryptionService.class)
public interface EncryptionService {
String base64(byte[] toEncode);
String toHexString(byte[] raw);
byte[] fromBase64(String encoded);
byte[] fromHexString(String hex);
String hex(byte[] toEncode);
String hmacSha256Base64(String toEncode, byte[] key) throws NoSuchAlgorithmException,
NoSuchProviderException, InvalidKeyException;
byte[] fromHex(String encoded);
String sha1Base64(InputStream toEncode) throws NoSuchAlgorithmException, NoSuchProviderException,
InvalidKeyException;
byte[] rsaSign(String toSign, Key privateKey);
String hmacSha1Base64(String toEncode, byte[] key) throws NoSuchAlgorithmException,
NoSuchProviderException, InvalidKeyException;
byte[] hmacSha256(String toEncode, byte[] key);
String md5Hex(byte[] toEncode) throws NoSuchAlgorithmException, NoSuchProviderException,
InvalidKeyException, UnsupportedEncodingException;
byte[] hmacSha1(String toEncode, byte[] key);
String md5Base64(byte[] toEncode) throws NoSuchAlgorithmException, NoSuchProviderException,
InvalidKeyException;
byte[] sha1(InputStream toEncode);
byte[] md5(byte[] plainBytes);
byte[] sha256(InputStream toEncode);
byte[] md5(InputStream toEncode);
String toBase64String(byte[] resBuf);
byte[] md5(Object data);
MD5InputStreamResult generateMD5Result(InputStream toEncode);
MD5InputStreamResult md5Result(InputStream toEncode);
MD5OutputStream md5OutputStream(OutputStream out);
@ -89,19 +73,13 @@ public interface EncryptionService {
public final byte[] md5;
public final long length;
public MD5InputStreamResult(byte[] data, byte[] eTag, long length) {
public MD5InputStreamResult(byte[] data, byte[] md5, long length) {
this.data = checkNotNull(data, "data");
this.md5 = checkNotNull(eTag, "eTag");
this.md5 = checkNotNull(md5, "md5");
checkArgument(length >= 0, "length cannot me negative");
this.length = length;
}
}
byte[] fromBase64String(String encoded);
byte[] rsaPrivateEncrypt(String toSign, Key privateKey) throws NoSuchAlgorithmException,
NoSuchPaddingException, InvalidKeyException, IllegalBlockSizeException,
BadPaddingException;
}

56
core/src/main/java/org/jclouds/encryption/internal/BaseEncryptionService.java
View File

@ -18,22 +18,10 @@
*/
package org.jclouds.encryption.internal;
import static com.google.common.base.Preconditions.checkNotNull;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
import org.jclouds.encryption.EncryptionService;
import com.google.common.base.Throwables;
/**
*
* @author Adrian Cole
@ -44,7 +32,8 @@ public abstract class BaseEncryptionService implements EncryptionService {
(byte) '5', (byte) '6', (byte) '7', (byte) '8', (byte) '9', (byte) 'a', (byte) 'b',
(byte) 'c', (byte) 'd', (byte) 'e', (byte) 'f' };
public String toHexString(byte[] raw) {
@Override
public String hex(byte[] raw) {
byte[] hex = new byte[2 * raw.length];
int index = 0;
@ -60,7 +49,8 @@ public abstract class BaseEncryptionService implements EncryptionService {
}
}
public byte[] fromHexString(String hex) {
@Override
public byte[] fromHex(String hex) {
if (hex.startsWith("0x"))
hex = hex.substring(2);
byte[] bytes = new byte[hex.length() / 2];
@ -70,42 +60,4 @@ public abstract class BaseEncryptionService implements EncryptionService {
return bytes;
}
public String md5Hex(byte[] toEncode) throws NoSuchAlgorithmException, NoSuchProviderException,
InvalidKeyException, UnsupportedEncodingException {
byte[] resBuf = md5(toEncode);
return toHexString(resBuf);
}
public String md5Base64(byte[] toEncode) throws NoSuchAlgorithmException,
NoSuchProviderException, InvalidKeyException {
byte[] resBuf = md5(toEncode);
return toBase64String(resBuf);
}
/**
* @throws IOException
*/
public byte[] md5(Object data) {
checkNotNull(data, "data must be set before calling generateETag()");
byte[] md5 = null;
if (data == null) {
} else if (data instanceof byte[]) {
md5 = md5((byte[]) data);
} else if (data instanceof String) {
md5 = md5(((String) data).getBytes());
} else if (data instanceof File) {
try {
md5 = md5(new FileInputStream((File) data));
} catch (FileNotFoundException e) {
Throwables.propagate(e);
}
} else if (data instanceof InputStream) {
md5 = md5(((InputStream) data));
} else {
throw new UnsupportedOperationException("Content not supported " + data.getClass());
}
return md5;
}
}

85
core/src/main/java/org/jclouds/encryption/internal/JCEEncryptionService.java
View File

@ -27,15 +27,12 @@ import java.security.InvalidKeyException;
import java.security.Key;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
import javax.crypto.BadPaddingException;
import javax.crypto.Cipher;
import javax.crypto.IllegalBlockSizeException;
import javax.crypto.Mac;
import javax.crypto.NoSuchPaddingException;
import javax.crypto.spec.SecretKeySpec;
import com.google.common.base.Throwables;
import com.google.common.io.Closeables;
/**
@ -44,14 +41,14 @@ import com.google.common.io.Closeables;
*/
public class JCEEncryptionService extends BaseEncryptionService {
public String hmacSha256Base64(String toEncode, byte[] key) throws NoSuchAlgorithmException,
NoSuchProviderException, InvalidKeyException {
return hmacBase64(toEncode, key, "HmacSHA256");
@Override
public byte[] hmacSha256(String toEncode, byte[] key) {
return hmac(toEncode, key, "HmacSHA256");
}
private String hmacBase64(String toEncode, byte[] key, String algorithm) {
byte[] resBuf = hmac(toEncode, key, algorithm);
return toBase64String(resBuf);
@Override
public byte[] hmacSha1(String toEncode, byte[] key) {
return hmac(toEncode, key, "HmacSHA1");
}
public byte[] hmac(String toEncode, byte[] key, String algorithm) {
@ -71,17 +68,7 @@ public class JCEEncryptionService extends BaseEncryptionService {
return mac.doFinal(toEncode.getBytes());
}
public String hmacSha1Base64(String toEncode, byte[] key) throws NoSuchAlgorithmException,
NoSuchProviderException, InvalidKeyException {
return hmacBase64(toEncode, key, "HmacSHA1");
}
public byte[] md5(byte[] plainBytes) {
MessageDigest eTag = getDigest();
eTag.update(plainBytes, 0, plainBytes.length);
return eTag.digest();
}
@Override
public byte[] md5(InputStream toEncode) {
MessageDigest eTag = getDigest();
byte[] buffer = new byte[1024];
@ -101,11 +88,18 @@ public class JCEEncryptionService extends BaseEncryptionService {
return eTag.digest();
}
public String toBase64String(byte[] resBuf) {
@Override
public String base64(byte[] resBuf) {
return Base64.encodeBytes(resBuf, Base64.DONT_BREAK_LINES);
}
public MD5InputStreamResult generateMD5Result(InputStream toEncode) {
@Override
public byte[] fromBase64(String encoded) {
return Base64.decode(encoded);
}
@Override
public MD5InputStreamResult md5Result(InputStream toEncode) {
MessageDigest eTag = getDigest();
byte[] buffer = new byte[1024];
ByteArrayOutputStream out = new ByteArrayOutputStream();
@ -129,7 +123,7 @@ public class JCEEncryptionService extends BaseEncryptionService {
return new MD5InputStreamResult(out.toByteArray(), eTag.digest(), length);
}
public static MessageDigest getDigest() {
private static MessageDigest getDigest() {
MessageDigest eTag;
try {
eTag = MessageDigest.getInstance("MD5");
@ -139,16 +133,12 @@ public class JCEEncryptionService extends BaseEncryptionService {
return eTag;
}
public byte[] fromBase64String(String encoded) {
return Base64.decode(encoded);
}
@Override
public MD5OutputStream md5OutputStream(OutputStream out) {
return new JCEMD5OutputStream(out);
}
public static class JCEMD5OutputStream extends MD5OutputStream {
private static class JCEMD5OutputStream extends MD5OutputStream {
public JCEMD5OutputStream(OutputStream out) {
super(new DigestOutputStream(out, getDigest()));
}
@ -161,9 +151,23 @@ public class JCEEncryptionService extends BaseEncryptionService {
}
@Override
public String sha1Base64(InputStream plainBytes) throws NoSuchAlgorithmException,
NoSuchProviderException, InvalidKeyException {
MessageDigest sha1 = MessageDigest.getInstance("SHA1");
public byte[] sha1(InputStream plainBytes) {
return digest(plainBytes, "SHA1");
}
@Override
public byte[] sha256(InputStream plainBytes) {
return digest(plainBytes, "SHA256");
}
private byte[] digest(InputStream plainBytes, String algorithm) {
MessageDigest digest;
try {
digest = MessageDigest.getInstance(algorithm);
} catch (NoSuchAlgorithmException e1) {
Throwables.propagate(e1);
return null;
}
byte[] buffer = new byte[1024];
long length = 0;
int numRead = -1;
@ -172,7 +176,7 @@ public class JCEEncryptionService extends BaseEncryptionService {
numRead = plainBytes.read(buffer);
if (numRead > 0) {
length += numRead;
sha1.update(buffer, 0, numRead);
digest.update(buffer, 0, numRead);
}
} while (numRead != -1);
} catch (IOException e) {
@ -181,15 +185,20 @@ public class JCEEncryptionService extends BaseEncryptionService {
Closeables.closeQuietly(plainBytes);
}
return toBase64String(sha1.digest());
return digest.digest();
}
@Override
public byte[] rsaPrivateEncrypt(String toSign, Key key) throws NoSuchAlgorithmException,
NoSuchPaddingException, InvalidKeyException, IllegalBlockSizeException,
BadPaddingException {
Cipher cipher = Cipher.getInstance("RSA");
public byte[] rsaSign(String toSign, Key key) {
Cipher cipher;
try {
cipher = Cipher.getInstance("RSA");
cipher.init(Cipher.ENCRYPT_MODE, key);
return cipher.doFinal(toSign.getBytes());
} catch (Exception e) {
Throwables.propagate(e);
return null;
}
}
}

5
core/src/main/java/org/jclouds/http/filters/BasicAuthentication.java
View File

@ -54,9 +54,8 @@ public class BasicAuthentication implements HttpRequestFilter {
@Named(PROPERTY_CREDENTIAL) String password, EncryptionService encryptionService)
throws UnsupportedEncodingException {
this.credentialList = ImmutableSet.of("Basic "
+ encryptionService.toBase64String(String.format("%s:%s",
checkNotNull(user, "user"), checkNotNull(password, "password")).getBytes(
"UTF-8")));
+ encryptionService.base64(String.format("%s:%s", checkNotNull(user, "user"),
checkNotNull(password, "password")).getBytes("UTF-8")));
}
public void filter(HttpRequest request) throws HttpException {

8
core/src/main/java/org/jclouds/http/internal/BasePayloadEnclosingImpl.java
View File

@ -31,7 +31,6 @@ import org.jclouds.encryption.EncryptionService.MD5InputStreamResult;
import org.jclouds.http.Payload;
import org.jclouds.http.PayloadEnclosing;
import org.jclouds.http.Payloads;
import org.jclouds.http.payloads.InputStreamPayload;
import com.google.common.io.Closeables;
@ -55,14 +54,13 @@ public abstract class BasePayloadEnclosingImpl implements PayloadEnclosing {
@Override
public void generateMD5() {
checkState(payload != null, "payload");
if (payload instanceof InputStreamPayload) {
MD5InputStreamResult result = encryptionService
.generateMD5Result(((InputStreamPayload) payload).getInput());
if (!payload.isRepeatable()) {
MD5InputStreamResult result = encryptionService.md5Result(payload.getInput());
setContentMD5(result.md5);
setContentLength(result.length);
setPayload(result.data);
} else {
setContentMD5(encryptionService.md5(payload.getRawContent()));
setContentMD5(encryptionService.md5(payload.getInput()));
}
}

14
core/src/test/java/org/jclouds/encryption/EncryptionServiceTest.java
View File

@ -20,6 +20,7 @@ package org.jclouds.encryption;
import static org.testng.Assert.assertEquals;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
@ -84,7 +85,7 @@ public class EncryptionServiceTest extends PerformanceTest {
@Test(dataProvider = "hmacsha1")
public void testHmacSha1Base64(byte[] key, String message, String base64Digest)
throws NoSuchProviderException, NoSuchAlgorithmException, InvalidKeyException {
String b64 = encryptionService.hmacSha1Base64(message, key);
String b64 = encryptionService.base64(encryptionService.hmacSha1(message, key));
assertEquals(b64, base64Digest);
}
@ -126,14 +127,15 @@ public class EncryptionServiceTest extends PerformanceTest {
@Test(dataProvider = "eTag")
public void testMD5Digest(String message, String hexMD5Digest) throws NoSuchProviderException,
NoSuchAlgorithmException, InvalidKeyException, IOException {
String b64 = encryptionService.md5Hex(message.getBytes());
String b64 = encryptionService.hex(encryptionService.md5(new ByteArrayInputStream(message
.getBytes())));
assertEquals(hexMD5Digest, b64);
MD5OutputStream outputStream = encryptionService.md5OutputStream(new ByteArrayOutputStream());
ByteStreams.copy(ByteStreams.newInputStreamSupplier(message.getBytes()).getInput(),
outputStream);
assertEquals(encryptionService.fromHexString(hexMD5Digest), outputStream.getMD5());
assertEquals(encryptionService.fromHex(hexMD5Digest), outputStream.getMD5());
}
@ -141,14 +143,14 @@ public class EncryptionServiceTest extends PerformanceTest {
String hex = "0001020408102040";
public void testHexStringEncode() throws UnsupportedEncodingException {
assertEquals(encryptionService.toHexString(bytes), hex);
assertEquals(encryptionService.hex(bytes), hex);
}
public void testHexStringDecode() throws UnsupportedEncodingException {
assertEquals(encryptionService.fromHexString(hex), bytes);
assertEquals(encryptionService.fromHex(hex), bytes);
}
public void testHexStringDecodeOx() throws UnsupportedEncodingException {
assertEquals(encryptionService.fromHexString("0x" + hex), bytes);
assertEquals(encryptionService.fromHex("0x" + hex), bytes);
}
}

111
core/src/test/java/org/jclouds/http/BaseHttpCommandExecutorServiceIntegrationTest.java
View File

@ -29,11 +29,11 @@ import java.io.OutputStream;
import java.net.MalformedURLException;
import java.net.URI;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicInteger;
import org.jclouds.encryption.internal.JCEEncryptionService;
import org.jclouds.http.options.GetOptions;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.DataProvider;
@ -43,80 +43,77 @@ import com.google.common.collect.ImmutableMap;
import com.google.common.io.Closeables;
/**
* Tests for functionality all HttpCommandExecutorServices must express. These
* tests will operate against an in-memory http engine, so as to ensure
* end-to-end functionality works.
* Tests for functionality all HttpCommandExecutorServices must express. These tests will operate
* against an in-memory http engine, so as to ensure end-to-end functionality works.
*
* @author Adrian Cole
*/
@Test(threadPoolSize = 10, groups = "integration", sequential = true)
public abstract class BaseHttpCommandExecutorServiceIntegrationTest extends
BaseJettyTest {
public abstract class BaseHttpCommandExecutorServiceIntegrationTest extends BaseJettyTest {
@Test(invocationCount = 25, timeOut = 5000)
public void testRequestFilter() throws MalformedURLException,
ExecutionException, InterruptedException, TimeoutException {
public void testRequestFilter() throws MalformedURLException, ExecutionException,
InterruptedException, TimeoutException {
assertEquals(client.downloadFilter("", "filterme").trim(), "test");
}
// TODO: filtering redirect test
@Test(invocationCount = 25, timeOut = 5000)
public void testGetStringWithHeader() throws MalformedURLException,
ExecutionException, InterruptedException, TimeoutException {
public void testGetStringWithHeader() throws MalformedURLException, ExecutionException,
InterruptedException, TimeoutException {
assertEquals(client.download("", "test").trim(), "test");
}
@Test(invocationCount = 25, timeOut = 5000)
public void testGetString() throws MalformedURLException,
ExecutionException, InterruptedException, TimeoutException {
public void testGetString() throws MalformedURLException, ExecutionException,
InterruptedException, TimeoutException {
assertEquals(client.download("").trim(), XML);
}
@DataProvider(name = "gets")
public Object[][] createData() {
return new Object[][] { { "object" }, { "/path" }, { "sp ace" },
{ "unic₪de" }, { "qu?stion" } };
return new Object[][] { { "object" }, { "/path" }, { "sp ace" }, { "unic₪de" },
{ "qu?stion" } };
}
@Test(invocationCount = 25, timeOut = 5000, dataProvider = "gets")
public void testGetStringSynch(String uri) throws MalformedURLException,
ExecutionException, InterruptedException, TimeoutException {
public void testGetStringSynch(String uri) throws MalformedURLException, ExecutionException,
InterruptedException, TimeoutException {
// TODO why need trim?
assertEquals(client.synch(uri).trim(), XML);
}
@Test(invocationCount = 25, timeOut = 5000)
public void testGetException() throws MalformedURLException,
ExecutionException, InterruptedException, TimeoutException {
assertEquals(client.downloadException("", GetOptions.Builder.tail(1))
.trim(), "foo");
public void testGetException() throws MalformedURLException, ExecutionException,
InterruptedException, TimeoutException {
assertEquals(client.downloadException("", GetOptions.Builder.tail(1)).trim(), "foo");
}
@Test(invocationCount = 25, timeOut = 5000)
public void testGetSynchException() throws MalformedURLException,
ExecutionException, InterruptedException, TimeoutException {
public void testGetSynchException() throws MalformedURLException, ExecutionException,
InterruptedException, TimeoutException {
assertEquals(client.synchException("", "").trim(), "foo");
}
@Test(invocationCount = 25, timeOut = 5000)
public void testGetStringRedirect() throws MalformedURLException,
ExecutionException, InterruptedException, TimeoutException {
public void testGetStringRedirect() throws MalformedURLException, ExecutionException,
InterruptedException, TimeoutException {
assertEquals(client.download("redirect").trim(), XML2);
}
@Test(invocationCount = 100, timeOut = 5000)
public void testGetBigFile() throws MalformedURLException,
ExecutionException, InterruptedException, TimeoutException {
assertEquals(encryptionService.toBase64String(encryptionService
.md5(context.utils().http().get(
public void testGetBigFile() throws MalformedURLException, ExecutionException,
InterruptedException, TimeoutException {
assertEquals(
encryptionService.base64(encryptionService.md5(context.utils().http().get(
URI.create(String.format("http://localhost:%d/%s", testPort,
"101constitutions"))))), md5);
}
@Test(enabled = false, invocationCount = 25, timeOut = 5000)
public void testGetStringPermanentRedirect() throws MalformedURLException,
ExecutionException, InterruptedException, TimeoutException {
public void testGetStringPermanentRedirect() throws MalformedURLException, ExecutionException,
InterruptedException, TimeoutException {
// GetString get = factory.createGetString("permanentredirect");
// assert get != null;
// client.submit(get);
@ -126,14 +123,14 @@ public abstract class BaseHttpCommandExecutorServiceIntegrationTest extends
}
@Test(invocationCount = 25, timeOut = 5000)
public void testPost() throws MalformedURLException, ExecutionException,
InterruptedException, TimeoutException {
public void testPost() throws MalformedURLException, ExecutionException, InterruptedException,
TimeoutException {
assertEquals(client.post("", "foo").trim(), "fooPOST");
}
@Test(invocationCount = 25, timeOut = 10000)
public void testPostAsInputStream() throws MalformedURLException,
ExecutionException, InterruptedException, TimeoutException {
public void testPostAsInputStream() throws MalformedURLException, ExecutionException,
InterruptedException, TimeoutException {
try {
assertEquals(client.postAsInputStream("", "foo").trim(), "fooPOST");
} catch (Exception e) {
@ -142,8 +139,8 @@ public abstract class BaseHttpCommandExecutorServiceIntegrationTest extends
}
/**
* Tests sending a big file to the server. Note: this is a heavy test, takes
* several minutes to finish.
* Tests sending a big file to the server. Note: this is a heavy test, takes several minutes to
* finish.
*
* @throws java.io.IOException
*/
@ -157,10 +154,14 @@ public abstract class BaseHttpCommandExecutorServiceIntegrationTest extends
f = File.createTempFile(filename, "tmp");
f.deleteOnExit();
long length = (long) (Runtime.getRuntime().freeMemory() * 1.1);
os = new BufferedOutputStream(
new FileOutputStream(f.getAbsolutePath()));
os = new BufferedOutputStream(new FileOutputStream(f.getAbsolutePath()));
MessageDigest eTag;
try {
eTag = MessageDigest.getInstance("MD5");
} catch (NoSuchAlgorithmException e) {
throw new RuntimeException("Could not find the MD5 algorithm", e);
}
MessageDigest eTag = JCEEncryptionService.getDigest();
ByteArrayOutputStream out = new ByteArrayOutputStream();
try {
for (long i = 0; i < length; i++) {
@ -175,9 +176,8 @@ public abstract class BaseHttpCommandExecutorServiceIntegrationTest extends
}
// upload and verify the response
assertEquals(client.postWithMd5("fileso",
this.encryptionService.toBase64String(eTag.digest()), f).trim(),
"created");
assertEquals(client.postWithMd5("fileso", this.encryptionService.base64(eTag.digest()),
f).trim(), "created");
} finally {
if (os != null)
@ -201,40 +201,39 @@ public abstract class BaseHttpCommandExecutorServiceIntegrationTest extends
}
@Test(invocationCount = 25, timeOut = 5000)
public void testPostBinder() throws MalformedURLException,
ExecutionException, InterruptedException, TimeoutException {
public void testPostBinder() throws MalformedURLException, ExecutionException,
InterruptedException, TimeoutException {
assertEquals(client.postJson("", "foo").trim(), "{\"key\":\"foo\"}POST");
}
@Test(invocationCount = 25, timeOut = 5000)
public void testPut() throws MalformedURLException, ExecutionException,
InterruptedException, TimeoutException {
public void testPut() throws MalformedURLException, ExecutionException, InterruptedException,
TimeoutException {
assertEquals(client.upload("", "foo").trim(), "fooPUT");
}
@Test(invocationCount = 25, timeOut = 5000)
public void testPutRedirect() throws MalformedURLException,
ExecutionException, InterruptedException, TimeoutException {
public void testPutRedirect() throws MalformedURLException, ExecutionException,
InterruptedException, TimeoutException {
assertEquals(client.upload("redirect", "foo").trim(), "fooPUTREDIRECT");
}
@Test(invocationCount = 25, timeOut = 5000)
public void testKillRobotSlowly() throws MalformedURLException,
ExecutionException, InterruptedException, TimeoutException {
assertEquals(client.action("robot", "kill",
ImmutableMap.of("death", "slow")).trim(),
public void testKillRobotSlowly() throws MalformedURLException, ExecutionException,
InterruptedException, TimeoutException {
assertEquals(client.action("robot", "kill", ImmutableMap.of("death", "slow")).trim(),
"robot->kill:{death=slow}");
}
@Test(invocationCount = 25, timeOut = 5000)
public void testHead() throws MalformedURLException, ExecutionException,
InterruptedException, TimeoutException {
public void testHead() throws MalformedURLException, ExecutionException, InterruptedException,
TimeoutException {
assert client.exists("");
}
@Test(invocationCount = 25, timeOut = 5000)
public void testGetAndParseSax() throws MalformedURLException,
ExecutionException, InterruptedException, TimeoutException {
public void testGetAndParseSax() throws MalformedURLException, ExecutionException,
InterruptedException, TimeoutException {
assertEquals(client.downloadAndParse(""), "whoppers");
}
}

4
core/src/test/java/org/jclouds/http/BaseJettyTest.java
View File

@ -85,8 +85,8 @@ public abstract class BaseJettyTest {
encryptionService = Guice.createInjector().getInstance(EncryptionService.class);
md5 = encryptionService.md5Base64(ByteStreams.toByteArray(oneHundredOneConstitutions
.getInput()));
md5 = encryptionService
.base64(encryptionService.md5(oneHundredOneConstitutions.getInput()));
Handler server1Handler = new AbstractHandler() {
public void handle(String target, HttpServletRequest request,

6
core/src/test/java/org/jclouds/http/internal/WireLiveTest.java
View File

@ -65,7 +65,7 @@ public class WireLiveTest {
ByteStreams.copy(in, out);
byte[] compare = encryptionService.md5(new ByteArrayInputStream(out.toByteArray()));
Thread.sleep(100);
assertEquals(encryptionService.toHexString(compare), checkNotNull(sysHttpStreamMd5,
assertEquals(encryptionService.hex(compare), checkNotNull(sysHttpStreamMd5,
sysHttpStreamMd5));
assertEquals(((BufferLogger) wire.getWireLog()).buff.toString().getBytes().length, 3331484);
return null;
@ -145,7 +145,7 @@ public class WireLiveTest {
InputStream in = wire.input(connection.getInputStream());
byte[] compare = encryptionService.md5(in);
Thread.sleep(100);
assertEquals(encryptionService.toHexString(compare), checkNotNull(sysHttpStreamMd5,
assertEquals(encryptionService.hex(compare), checkNotNull(sysHttpStreamMd5,
sysHttpStreamMd5));
assertEquals(((BufferLogger) wire.getWireLog()).buff.toString().getBytes().length, 3331484);
}
@ -168,7 +168,7 @@ public class WireLiveTest {
InputStream in = wire.input(connection.getInputStream());
byte[] compare = encryptionService.md5(in);
Thread.sleep(100);
assertEquals(encryptionService.toHexString(compare), checkNotNull(sysHttpStreamMd5,
assertEquals(encryptionService.hex(compare), checkNotNull(sysHttpStreamMd5,
sysHttpStreamMd5));
assertEquals(((BufferLogger) wire.getWireLog()).buff.toString().getBytes().length, 3331484);
}

72
extensions/bouncycastle/src/main/java/org/jclouds/encryption/bouncycastle/BouncyCastleEncryptionService.java
View File

@ -22,15 +22,9 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.security.InvalidKeyException;
import java.security.Key;
import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
import javax.crypto.BadPaddingException;
import javax.crypto.Cipher;
import javax.crypto.IllegalBlockSizeException;
import javax.crypto.NoSuchPaddingException;
import javax.inject.Singleton;
import org.bouncycastle.crypto.Digest;
@ -44,6 +38,7 @@ import org.bouncycastle.util.encoders.Base64;
import org.jclouds.encryption.internal.BaseEncryptionService;
import org.jclouds.util.Utils;
import com.google.common.base.Throwables;
import com.google.common.io.Closeables;
/**
@ -52,15 +47,15 @@ import com.google.common.io.Closeables;
*/
@Singleton
public class BouncyCastleEncryptionService extends BaseEncryptionService {
public String hmacSha256Base64(String toEncode, byte[] key) throws NoSuchAlgorithmException,
NoSuchProviderException, InvalidKeyException {
Digest digest = new SHA256Digest();
return hmacBase64(toEncode, key, digest);
@Override
public byte[] hmacSha256(String toEncode, byte[] key) {
return hmac(toEncode, key, new SHA256Digest());
}
private String hmacBase64(String toEncode, byte[] key, Digest digest) {
byte[] resBuf = hmac(toEncode, key, digest);
return toBase64String(resBuf);
@Override
public byte[] hmacSha1(String toEncode, byte[] key) {
return hmac(toEncode, key, new SHA1Digest());
}
public byte[] hmac(String toEncode, byte[] key, Digest digest) {
@ -74,20 +69,7 @@ public class BouncyCastleEncryptionService extends BaseEncryptionService {
return resBuf;
}
public String hmacSha1Base64(String toEncode, byte[] key) throws NoSuchAlgorithmException,
NoSuchProviderException, InvalidKeyException {
Digest digest = new SHA1Digest();
return hmacBase64(toEncode, key, digest);
}
public byte[] md5(byte[] plainBytes) {
MD5Digest eTag = new MD5Digest();
byte[] resBuf = new byte[eTag.getDigestSize()];
eTag.update(plainBytes, 0, plainBytes.length);
eTag.doFinal(resBuf, 0);
return resBuf;
}
@Override
public byte[] md5(InputStream toEncode) {
MD5Digest eTag = new MD5Digest();
byte[] resBuf = new byte[eTag.getDigestSize()];
@ -109,11 +91,13 @@ public class BouncyCastleEncryptionService extends BaseEncryptionService {
return resBuf;
}
public String toBase64String(byte[] resBuf) {
@Override
public String base64(byte[] resBuf) {
return new String(Base64.encode(resBuf));
}
public MD5InputStreamResult generateMD5Result(InputStream toEncode) {
@Override
public MD5InputStreamResult md5Result(InputStream toEncode) {
MD5Digest eTag = new MD5Digest();
byte[] resBuf = new byte[eTag.getDigestSize()];
byte[] buffer = new byte[1024];
@ -139,7 +123,8 @@ public class BouncyCastleEncryptionService extends BaseEncryptionService {
return new MD5InputStreamResult(out.toByteArray(), resBuf, length);
}
public byte[] fromBase64String(String encoded) {
@Override
public byte[] fromBase64(String encoded) {
return Base64.decode(encoded);
}
@ -148,7 +133,7 @@ public class BouncyCastleEncryptionService extends BaseEncryptionService {
return new BouncyCastleMD5OutputStream(out);
}
public static class BouncyCastleMD5OutputStream extends MD5OutputStream {
private static class BouncyCastleMD5OutputStream extends MD5OutputStream {
public BouncyCastleMD5OutputStream(OutputStream out) {
super(new DigestOutputStream(out, new MD5Digest()));
}
@ -163,9 +148,16 @@ public class BouncyCastleEncryptionService extends BaseEncryptionService {
}
@Override
public String sha1Base64(InputStream plainBytes) throws NoSuchAlgorithmException,
NoSuchProviderException, InvalidKeyException {
Digest digest = new SHA1Digest();
public byte[] sha256(InputStream plainBytes) {
return sha(plainBytes, new SHA256Digest());
}
@Override
public byte[] sha1(InputStream plainBytes) {
return sha(plainBytes, new SHA1Digest());
}
private byte[] sha(InputStream plainBytes, Digest digest) {
byte[] resBuf = new byte[digest.getDigestSize()];
byte[] buffer = new byte[1024];
long length = 0;
@ -184,16 +176,20 @@ public class BouncyCastleEncryptionService extends BaseEncryptionService {
Closeables.closeQuietly(plainBytes);
}
digest.doFinal(resBuf, 0);
return toBase64String(resBuf);
return resBuf;
}
@Override
public byte[] rsaPrivateEncrypt(String toSign, Key key) throws NoSuchAlgorithmException,
NoSuchPaddingException, InvalidKeyException, IllegalBlockSizeException,
BadPaddingException {
public byte[] rsaSign(String toSign, Key key) {
// TODO convert this to BC code
try {
Cipher cipher = Cipher.getInstance("RSA");
cipher.init(Cipher.ENCRYPT_MODE, key);
return cipher.doFinal(toSign.getBytes());
} catch (Exception e) {
Throwables.propagate(e);
return null;
}
}
}

3
gogrid/src/main/java/org/jclouds/gogrid/filters/SharedKeyLiteAuthentication.java
View File

@ -42,6 +42,7 @@ import org.jclouds.encryption.EncryptionService;
import org.jclouds.http.HttpRequest;
import org.jclouds.http.HttpRequestFilter;
import org.jclouds.logging.Logger;
import org.jclouds.util.Utils;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Multimap;
@ -95,7 +96,7 @@ public class SharedKeyLiteAuthentication implements HttpRequestFilter {
private String getMd5For(String stringToHash) {
try {
return encryptionService.md5Hex(stringToHash.getBytes());
return encryptionService.hex(encryptionService.md5(Utils.toInputStream(stringToHash)));
} catch (Exception e) {
throw new RuntimeException(e);
}

2
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/binders/BindCFObjectToPayload.java
View File

@ -58,7 +58,7 @@ public class BindCFObjectToPayload extends BindBlobToPayloadAndUserMetadataToHea
super.bindToRequest(request, object2Blob.apply(object));
if (object.getInfo().getHash() != null) {
request.getHeaders().put(HttpHeaders.ETAG,
encryptionService.toHexString(object.getInfo().getHash()));
encryptionService.hex(object.getInfo().getHash()));
request.getHeaders().removeAll("Content-MD5");
}

2
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/blobstore/functions/ObjectToBlobMetadata.java
View File

@ -54,7 +54,7 @@ public class ObjectToBlobMetadata implements Function<ObjectInfo, MutableBlobMet
if (from.getContentType() != null)
to.setContentType(from.getContentType());
if (from.getHash() != null)
to.setETag(encryptionService.toHexString(from.getHash()));
to.setETag(encryptionService.hex(from.getHash()));
to.setName(from.getName());
if (from.getBytes() != null)
to.setSize(from.getBytes());

2
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/blobstore/functions/ResourceToObjectInfo.java
View File

@ -56,7 +56,7 @@ public class ResourceToObjectInfo implements
to.setContentType("application/directory");
}
if (from.getETag() != null && to.getHash() == null)
to.setHash(encryptionService.fromHexString(from.getETag()));
to.setHash(encryptionService.fromHex(from.getETag()));
to.setName(from.getName());
to.setLastModified(from.getLastModified());
if (from.getSize() != null)

2
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ParseObjectInfoFromHeaders.java
View File

@ -60,7 +60,7 @@ public class ParseObjectInfoFromHeaders implements
String eTagHeader = from.getFirstHeaderOrNull("Etag");
if (eTagHeader != null) {
String hashString = Utils.replaceAll(eTagHeader, '"', "");
to.setHash(encryptionService.fromHexString(hashString));
to.setHash(encryptionService.fromHex(hashString));
}
return to;
}

2
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ParseObjectInfoListFromJsonResponse.java
View File

@ -82,7 +82,7 @@ public class ParseObjectInfoListFromJsonResponse extends ParseJson<PageSet<Objec
}
public byte[] getHash() {
return encryptionService.fromHexString(hash);
return encryptionService.fromHex(hash);
}
public Date getLastModified() {

16
rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/CloudFilesClientLiveTest.java
View File

@ -304,7 +304,7 @@ public class CloudFilesClientLiveTest extends BaseBlobStoreIntegrationTest {
CFObject object = newCFObject(data, key);
byte[] md5 = object.getInfo().getHash();
String newEtag = getApi().putObject(containerName, object);
assertEquals(encryptionService.toHexString(md5), encryptionService.toHexString(object
assertEquals(encryptionService.hex(md5), encryptionService.hex(object
.getInfo().getHash()));
// Test HEAD of missing object
@ -316,9 +316,9 @@ public class CloudFilesClientLiveTest extends BaseBlobStoreIntegrationTest {
// TODO assertEquals(metadata.getName(), object.getMetadata().getName());
assertEquals(metadata.getBytes(), new Long(data.length()));
assertEquals(metadata.getContentType(), "text/plain");
assertEquals(encryptionService.toHexString(md5), encryptionService.toHexString(object
assertEquals(encryptionService.hex(md5), encryptionService.hex(object
.getInfo().getHash()));
assertEquals(metadata.getHash(), encryptionService.fromHexString(newEtag));
assertEquals(metadata.getHash(), encryptionService.fromHex(newEtag));
assertEquals(metadata.getMetadata().entrySet().size(), 1);
assertEquals(metadata.getMetadata().get("metadata"), "metadata-value");
@ -336,9 +336,9 @@ public class CloudFilesClientLiveTest extends BaseBlobStoreIntegrationTest {
// TODO assertEquals(getBlob.getName(), object.getMetadata().getName());
assertEquals(getBlob.getContentLength(), new Long(data.length()));
assertEquals(getBlob.getInfo().getContentType(), "text/plain");
assertEquals(encryptionService.toHexString(md5), encryptionService.toHexString(getBlob
assertEquals(encryptionService.hex(md5), encryptionService.hex(getBlob
.getInfo().getHash()));
assertEquals(encryptionService.fromHexString(newEtag), getBlob.getInfo().getHash());
assertEquals(encryptionService.fromHex(newEtag), getBlob.getInfo().getHash());
assertEquals(getBlob.getInfo().getMetadata().entrySet().size(), 2);
assertEquals(getBlob.getInfo().getMetadata().get("new-metadata-1"), "value-1");
assertEquals(getBlob.getInfo().getMetadata().get("new-metadata-2"), "value-2");
@ -346,7 +346,7 @@ public class CloudFilesClientLiveTest extends BaseBlobStoreIntegrationTest {
// Test PUT with invalid ETag (as if object's data was corrupted in transit)
String correctEtag = newEtag;
String incorrectEtag = "0" + correctEtag.substring(1);
object.getInfo().setHash(encryptionService.fromHexString(incorrectEtag));
object.getInfo().setHash(encryptionService.fromHex(incorrectEtag));
try {
getApi().putObject(containerName, object);
} catch (HttpResponseException e) {
@ -359,7 +359,7 @@ public class CloudFilesClientLiveTest extends BaseBlobStoreIntegrationTest {
blob.getInfo().setName("chunked-object");
blob.setPayload(bais);
newEtag = getApi().putObject(containerName, blob);
assertEquals(encryptionService.toHexString(md5), encryptionService.toHexString(getBlob
assertEquals(encryptionService.hex(md5), encryptionService.hex(getBlob
.getInfo().getHash()));
// Test GET with options
@ -374,7 +374,7 @@ public class CloudFilesClientLiveTest extends BaseBlobStoreIntegrationTest {
// Matching ETag
getBlob = getApi().getObject(containerName, object.getInfo().getName(),
GetOptions.Builder.ifETagMatches(newEtag));
assertEquals(getBlob.getInfo().getHash(), encryptionService.fromHexString(newEtag));
assertEquals(getBlob.getInfo().getHash(), encryptionService.fromHex(newEtag));
getBlob = getApi().getObject(containerName, object.getInfo().getName(),
GetOptions.Builder.startAt(8));
assertEquals(Utils.toStringAndClose(getBlob.getContent()), data.substring(8));