You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2013/09/10 01:45:58 UTC
git commit: Revert "Disable timed temporary signed URLs for AWS-S3"
Updated Branches:
refs/heads/master 3e5aa7852 -> 0930b638e
Revert "Disable timed temporary signed URLs for AWS-S3"
This reverts commit bc0abbaa073a9178f3aeb0d1541ea5fc50dded35 and
re-enables temp-signed URLs for S3.
Closes JCLOUDS-200
Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/commit/0930b638
Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/tree/0930b638
Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/diff/0930b638
Branch: refs/heads/master
Commit: 0930b638e3dd15e140c09d2e928619d7680a59c2
Parents: 3e5aa78
Author: Diwaker Gupta <di...@maginatics.com>
Authored: Thu Aug 29 14:54:38 2013 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Mon Sep 9 15:28:31 2013 -0700
----------------------------------------------------------------------
.../org/jclouds/aws/s3/blobstore/AWSS3BlobRequestSigner.java | 7 +++++--
.../jclouds/aws/s3/blobstore/AWSS3BlobSignerExpectTest.java | 4 ++--
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/0930b638/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/AWSS3BlobRequestSigner.java
----------------------------------------------------------------------
diff --git a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/AWSS3BlobRequestSigner.java b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/AWSS3BlobRequestSigner.java
index 02d1b38..dc33ec2 100644
--- a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/AWSS3BlobRequestSigner.java
+++ b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/AWSS3BlobRequestSigner.java
@@ -72,14 +72,17 @@ public class AWSS3BlobRequestSigner extends S3BlobRequestSigner<AWSS3AsyncClient
public HttpRequest signGetBlob(String container, String name, long timeInSeconds) {
checkNotNull(container, "container");
checkNotNull(name, "name");
- throw new UnsupportedOperationException();
+ HttpRequest request = processor.apply(Invocation.create(getMethod, ImmutableList.<Object> of(container, name)));
+ return cleanRequest(signForTemporaryAccess(request, timeInSeconds));
}
@Override
public HttpRequest signPutBlob(String container, Blob blob, long timeInSeconds) {
checkNotNull(container, "container");
checkNotNull(blob, "blob");
- throw new UnsupportedOperationException();
+ HttpRequest request = processor.apply(Invocation.create(createMethod,
+ ImmutableList.<Object>of(container, blobToObject.apply(blob))));
+ return cleanRequest(signForTemporaryAccess(request, timeInSeconds));
}
private HttpRequest signForTemporaryAccess(HttpRequest request, long timeInSeconds) {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/0930b638/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/AWSS3BlobSignerExpectTest.java
----------------------------------------------------------------------
diff --git a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/AWSS3BlobSignerExpectTest.java b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/AWSS3BlobSignerExpectTest.java
index eb27888..0b38b0b 100644
--- a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/AWSS3BlobSignerExpectTest.java
+++ b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/AWSS3BlobSignerExpectTest.java
@@ -50,7 +50,7 @@ public class AWSS3BlobSignerExpectTest extends S3BlobSignerExpectTest {
.addHeader("Date", DATE).build();
}
- @Test(expectedExceptions = UnsupportedOperationException.class)
+ @Test
public void testSignGetBlobWithTime() {
BlobStore getBlobWithTime = requestsSendResponses(init());
HttpRequest compare = getBlobWithTime();
@@ -68,7 +68,7 @@ public class AWSS3BlobSignerExpectTest extends S3BlobSignerExpectTest {
.addHeader("Date", DATE).build();
}
- @Test(expectedExceptions = UnsupportedOperationException.class)
+ @Test
public void testSignPutBlobWithTime() throws Exception {
BlobStore signPutBloblWithTime = requestsSendResponses(init());
Blob blob = signPutBloblWithTime.blobBuilder(name).payload(text).contentType("text/plain").build();