Skip to content
This repository has been archived by the owner on Jul 25, 2020. It is now read-only.

Commit

Permalink
JCLOUDS-1161: Make AWSS3BlobRequestSignerV4 the default signer.
Browse files Browse the repository at this point in the history 
Added new live tests and fixed some unit tests accordingly.
  • Loading branch information
@shrinandj @gaul
shrinandj authored and gaul committed Oct 19, 2016
1 parent 2c6caa0 commit 7826d22
Show file tree
Hide file tree
Showing 5 changed files with 94 additions and 14 deletions.
8 changes: 6 additions & 2 deletions apis/s3/src/test/java/org/jclouds/s3/blobstore/integration/S3BlobSignerLiveTest.java
View file
Expand Up @@ -52,7 +52,9 @@ public void testSignGetUrlWithTime() throws InterruptedException, IOException {
@Test
public void testSignGetUrlWithTimeExpired() throws InterruptedException, IOException {
try {
super.testSignGetUrlWithTimeExpired();
// Intentionally try with a timeout of 0. AWS signature v4 throws an error if
// the timeout is negative.
super.testSignGetUrlWithTime(/*timeout=*/ 0);
if (!supportsUrlWithTime()) {
fail();
}
Expand All @@ -76,7 +78,9 @@ public void testSignPutUrlWithTime() throws Exception {
@Test
public void testSignPutUrlWithTimeExpired() throws Exception {
try {
super.testSignPutUrlWithTimeExpired();
// Intentionally try with a timeout of 0. AWS signature v4 throws an error if
// the timeout is negative.
super.testSignPutUrlWithTime(/*timeout=*/ 0);
if (!supportsUrlWithTime()) {
fail();
}
Expand Down
20 changes: 14 additions & 6 deletions ...tore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobSignerLiveTest.java
View file
Expand Up @@ -98,8 +98,7 @@ public void testSignGetUrlWithTime() throws InterruptedException, IOException {
}
}

@Test
public void testSignGetUrlWithTimeExpired() throws InterruptedException, IOException {
public void testSignGetUrlWithTime(final long timeout) throws InterruptedException, IOException {
String name = "hello";
String text = "fooooooooooooooooooooooo";

Expand All @@ -108,7 +107,7 @@ public void testSignGetUrlWithTimeExpired() throws InterruptedException, IOExcep
try {
view.getBlobStore().putBlob(container, blob);
assertConsistencyAwareContainerSize(container, 1);
HttpRequest request = view.getSigner().signGetBlob(container, name, -getSignedUrlTimeout());
HttpRequest request = view.getSigner().signGetBlob(container, name, timeout);
assertEquals(request.getFilters().size(), 0);

try {
Expand All @@ -121,6 +120,11 @@ public void testSignGetUrlWithTimeExpired() throws InterruptedException, IOExcep
}
}

@Test
public void testSignGetUrlWithTimeExpired() throws InterruptedException, IOException {
testSignGetUrlWithTime(-getSignedUrlTimeout());
}

@Test
public void testSignPutUrl() throws Exception {
String name = "hello";
Expand Down Expand Up @@ -159,15 +163,14 @@ public void testSignPutUrlWithTime() throws Exception {
}
}

@Test
public void testSignPutUrlWithTimeExpired() throws Exception {
public void testSignPutUrlWithTime(final long timeout) throws InterruptedException, IOException {
String name = "hello";
String text = "fooooooooooooooooooooooo";

Blob blob = view.getBlobStore().blobBuilder(name).payload(text).contentType("text/plain").build();
String container = getContainerName();
try {
HttpRequest request = view.getSigner().signPutBlob(container, blob, -getSignedUrlTimeout());
HttpRequest request = view.getSigner().signPutBlob(container, blob, 0);
assertEquals(request.getFilters().size(), 0);

// Strip Expect: 100-continue to make actual responses visible, since
Expand All @@ -185,6 +188,11 @@ public void testSignPutUrlWithTimeExpired() throws Exception {
}
}

@Test
public void testSignPutUrlWithTimeExpired() throws Exception {
testSignPutUrlWithTime(-getSignedUrlTimeout());
}

@Test
public void testSignRemoveUrl() throws Exception {
String name = "hello";
Expand Down
4 changes: 2 additions & 2 deletions ...aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/config/AWSS3BlobStoreContextModule.java
View file
Expand Up @@ -16,7 +16,7 @@
*/
package org.jclouds.aws.s3.blobstore.config;

import org.jclouds.aws.s3.blobstore.AWSS3BlobRequestSigner;
import org.jclouds.aws.s3.blobstore.AWSS3BlobRequestSignerV4;
import org.jclouds.aws.s3.blobstore.AWSS3BlobStore;
import org.jclouds.blobstore.BlobRequestSigner;
import org.jclouds.s3.blobstore.S3BlobStore;
Expand All @@ -34,6 +34,6 @@ protected void configure() {

@Override
protected void bindRequestSigner() {
bind(BlobRequestSigner.class).to(AWSS3BlobRequestSigner.class);
bind(BlobRequestSigner.class).to(AWSS3BlobRequestSignerV4.class);
}
}
55 changes: 55 additions & 0 deletions providers/aws-s3/src/test/java/org/jclouds/aws/s3/AWSS3ClientLiveTest.java
View file
Expand Up @@ -22,12 +22,17 @@
import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.fail;

import com.google.common.collect.Iterables;
import org.jclouds.aws.AWSResponseException;
import org.jclouds.aws.domain.Region;
import org.jclouds.blobstore.BlobStore;
import org.jclouds.blobstore.domain.Blob;
import org.jclouds.blobstore.domain.StorageMetadata;
import org.jclouds.domain.Location;
import org.jclouds.http.HttpRequest;
import org.jclouds.http.HttpResponse;
import org.jclouds.location.predicates.LocationPredicates;
import org.jclouds.rest.HttpClient;
import org.jclouds.s3.S3Client;
import org.jclouds.s3.S3ClientLiveTest;
import org.jclouds.s3.domain.ListBucketResponse;
Expand Down Expand Up @@ -154,4 +159,54 @@ public void testDirectoryEndingWithSlash() throws InterruptedException {
returnContainer(containerName);
}
}

/**
* Test signed get/put operations using signature v4. This is done by explicitly
* using the "eu-central-1" region which only support signature v4.
*/
public void testV4SignatureOps() throws InterruptedException {
String containerName = getContainerName();
try {
BlobStore blobStore = view.getBlobStore();
Location location = Iterables.tryFind(blobStore.listAssignableLocations(),
LocationPredicates.idEquals(Region.EU_CENTRAL_1)).orNull();
assertNotNull(location);
blobStore.createContainerInLocation(location, containerName);

final HttpClient client = view.utils().http();
String blobName = "test-blob";
Blob blob = blobStore.blobBuilder(blobName).payload("something").build();

// Signed put, no timeout.
HttpRequest request = view.getSigner().signPutBlob(containerName, blob);
assertNotNull(request);
HttpResponse response = client.invoke(request);
assertEquals(response.getStatusCode(), 200);

// Signed get, no timeout.
request = view.getSigner().signGetBlob(containerName, blobName);
assertNotNull(request);
response = client.invoke(request);
assertEquals(response.getStatusCode(), 200);

blobStore.removeBlob(containerName, blobName);

// Signed put with timeout.
request = view.getSigner().signPutBlob(containerName, blob, /*seconds=*/ 60);
assertNotNull(request);
response = client.invoke(request);
assertEquals(response.getStatusCode(), 200);

// Signed get with timeout.
request = view.getSigner().signGetBlob(containerName, blobName, /*seconds=*/ 60);
assertNotNull(request);
response = client.invoke(request);
assertEquals(response.getStatusCode(), 200);

// Cleanup the container.
blobStore.removeBlob(containerName, blobName);
} finally {
returnContainer(containerName);
}
}
}
21 changes: 17 additions & 4 deletions providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/AWSS3BlobSignerExpectTest.java
View file
Expand Up @@ -18,6 +18,8 @@

import static org.testng.Assert.assertEquals;

import java.util.Map;

import org.jclouds.aws.s3.config.AWSS3HttpApiModule;
import org.jclouds.aws.s3.filters.AWSRequestAuthorizeSignature;
import org.jclouds.blobstore.BlobStore;
Expand All @@ -29,6 +31,7 @@
import org.jclouds.s3.filters.RequestAuthorizeSignature;
import org.testng.annotations.Test;

import com.google.common.base.Splitter;
import com.google.common.base.Supplier;
import com.google.inject.Module;
import com.google.inject.Scopes;
Expand Down Expand Up @@ -72,12 +75,21 @@ protected HttpRequest getBlobWithOptions() {
.addHeader("Authorization", "AWS identity:0uvBv1wEskuhFHYJF/L6kEV9A7o=").build();
}

private void compareRequestComponents(final HttpRequest request, final HttpRequest compare) {
assertEquals(request.getMethod(), compare.getMethod());
String query = request.getEndpoint().toString().split("\\?")[1];
final Map<String, String> params = Splitter.on('&').trimResults().withKeyValueSeparator("=").split(query);
assertEquals(params.get("X-Amz-Algorithm"), "AWS4-HMAC-SHA256");
assertEquals(params.get("X-Amz-Expires"), "3");
assertEquals(params.get("X-Amz-SignedHeaders"), "host");
}

@Test
public void testSignGetBlobWithTime() {
BlobStore getBlobWithTime = requestsSendResponses(init());
HttpRequest compare = getBlobWithTime();
assertEquals(getBlobWithTime.getContext().getSigner().signGetBlob(container, name, 3l /* seconds */),
compare);
HttpRequest request = getBlobWithTime.getContext().getSigner().signGetBlob(container, name, 3l /* seconds */);
compareRequestComponents(request, compare);
}

@Override
Expand Down Expand Up @@ -118,8 +130,9 @@ public void testSignPutBlobWithTime() throws Exception {
Blob blob = signPutBloblWithTime.blobBuilder(name).payload(text).contentType("text/plain").build();
HttpRequest compare = putBlobWithTime();
compare.setPayload(blob.getPayload());
assertEquals(signPutBloblWithTime.getContext().getSigner().signPutBlob(container, blob, 3l /* seconds */),
compare);
HttpRequest request = signPutBloblWithTime.getContext().getSigner().signPutBlob(container, blob, 3l /* seconds */);
compareRequestComponents(request, compare);
assertEquals(request.getPayload(), compare.getPayload());
}

@Override
Expand Down

0 comments on commit 7826d22

Please sign in to comment.