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

add aws s3 signature v4 #678

Closed
wants to merge 14 commits into from
Closed

add aws s3 signature v4 #678

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8c26f78
add aws s3 signature v4
Feb 11, 2015
cced1ac
remote unused javadoc,code. replace URLEncoder/MessageDigest with Gua…
Feb 14, 2015
dec09e2
add aws s3 temporary access signature
Feb 20, 2015
43b4ad0
move code
Feb 20, 2015
9a57455
add testcase AWSS3BlobRequestSignerV4 for AWSS3BlobRequestSignerV4 te…
Feb 27, 2015
abcb355
improvement, clean code and checkstyle pass
Apr 1, 2015
64d66ee
fixed get HTTP header HOST NPE, get host from request endpoint.
Apr 29, 2015
6c50945
move RequestAuthorizeSignatureV2 class to java file.
Apr 29, 2015
e345b8c
aws s3 signer v4 get host from endpoint.
May 4, 2015
5984a9b
impl aws s3 signer v4 chunked upload
May 4, 2015
2236fd4
remove Http Header Content-MD5, aws signer v4 not allowed.
May 19, 2015
e1846e8
fixed Payloads with 0 byte streams failed.
May 20, 2015
d0ac109
fixed bytesRead can be less than buffer.length!
May 20, 2015
f590287
fixed testcase AWSS3BlobRequestSignerV4.signGetBlob NPE
Jul 21, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
308 changes: 175 additions & 133 deletions apis/s3/src/main/java/org/jclouds/s3/config/S3HttpApiModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.jclouds.s3.config;

import java.net.URI;
import java.util.Date;
import java.util.Set;
import java.util.concurrent.TimeUnit;

Expand All @@ -25,6 +26,7 @@

import org.jclouds.Constants;
import org.jclouds.aws.config.AWSHttpApiModule;
import org.jclouds.aws.filters.FormSignerV4;
import org.jclouds.aws.handlers.AWSClientErrorRetryHandler;
import org.jclouds.aws.handlers.AWSServerErrorRetryHandler;
import org.jclouds.blobstore.ContainerNotFoundException;
Expand All @@ -33,6 +35,7 @@
import org.jclouds.date.DateService;
import org.jclouds.date.TimeStamp;
import org.jclouds.http.HttpErrorHandler;
import org.jclouds.http.HttpRequest;
import org.jclouds.http.HttpRetryHandler;
import org.jclouds.http.annotation.ClientError;
import org.jclouds.http.annotation.Redirection;
Expand All @@ -46,6 +49,7 @@
import org.jclouds.s3.blobstore.functions.BucketsToStorageMetadata;
import org.jclouds.s3.domain.BucketMetadata;
import org.jclouds.s3.filters.RequestAuthorizeSignature;
import org.jclouds.s3.filters.RequestAuthorizeSignatureV4;
import org.jclouds.s3.functions.GetRegionForBucket;
import org.jclouds.s3.handlers.ParseS3ErrorFromXmlContent;
import org.jclouds.s3.handlers.S3RedirectionRetryHandler;
Expand All @@ -68,144 +72,182 @@
@ConfiguresHttpApi
public class S3HttpApiModule<S extends S3Client> extends AWSHttpApiModule<S> {

@SuppressWarnings("unchecked")
public S3HttpApiModule() {
this(Class.class.cast(S3Client.class));
}

protected S3HttpApiModule(Class<S> syncClientType) {
super(syncClientType);
}

@Provides
@Bucket
@Singleton
protected CacheLoader<String, Optional<String>> bucketToRegion(@Region Supplier<Set<String>> regionSupplier,
final S3Client client) {
Set<String> regions = regionSupplier.get();
if (regions.size() == 0) {
return new CacheLoader<String, Optional<String>>() {

@Override
public Optional<String> load(String bucket) {
return Optional.absent();
}

@SuppressWarnings("unchecked")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like a lot of gratuitous reindentation.

public S3HttpApiModule() {
this(Class.class.cast(S3Client.class));
}

protected S3HttpApiModule(Class<S> syncClientType) {
super(syncClientType);
}

@Provides
@Bucket
@Singleton
protected CacheLoader<String, Optional<String>> bucketToRegion(@Region Supplier<Set<String>> regionSupplier,
final S3Client client) {
Set<String> regions = regionSupplier.get();
if (regions.size() == 0) {
return new CacheLoader<String, Optional<String>>() {

@Override
public Optional<String> load(String bucket) {
return Optional.absent();
}

@Override
public String toString() {
return "noRegions()";
}
};
} else if (regions.size() == 1) {
final String onlyRegion = Iterables.getOnlyElement(regions);
return new CacheLoader<String, Optional<String>>() {
Optional<String> onlyRegionOption = Optional.of(onlyRegion);

@Override
public Optional<String> load(String bucket) {
return onlyRegionOption;
}

@Override
public String toString() {
return "onlyRegion(" + onlyRegion + ")";
}
};
} else {
return new CacheLoader<String, Optional<String>>() {
@Override
public Optional<String> load(String bucket) {
try {
return Optional.fromNullable(client.getBucketLocation(bucket));
} catch (ContainerNotFoundException e) {
return null;
}
}

@Override
public String toString() {
return "bucketToRegion()";
}
};
}
}

@Provides
@Bucket
@Singleton
protected LoadingCache<String, Optional<String>> bucketToRegion(@Bucket CacheLoader<String, Optional<String>> loader) {
return CacheBuilder.newBuilder().build(loader);
}

@Provides
@Bucket
@Singleton
protected Supplier<String> defaultRegionForBucket(@Region Supplier<String> defaultRegion) {
return defaultRegion;
}

@Provides
@Singleton
@Bucket
protected Supplier<URI> provideBucketURI(@Bucket Supplier<String> defaultRegion,
RegionToEndpointOrProviderIfNull regionToEndpoint) {
return Suppliers.compose(regionToEndpoint, defaultRegion);
}

@Override
protected void configure() {
super.configure();
install(new S3ObjectModule());
install(new S3ParserModule());
bindRequestSigner();
bind(new TypeLiteral<Function<String, Optional<String>>>() {
}).annotatedWith(Bucket.class).to(GetRegionForBucket.class);
bind(new TypeLiteral<Function<Set<BucketMetadata>, PageSet<? extends StorageMetadata>>>() {
}).to(BucketsToStorageMetadata.class);
}

@Override
protected void bindErrorHandlers() {
bind(HttpErrorHandler.class).annotatedWith(Redirection.class).to(ParseS3ErrorFromXmlContent.class);
bind(HttpErrorHandler.class).annotatedWith(ClientError.class).to(ParseS3ErrorFromXmlContent.class);
bind(HttpErrorHandler.class).annotatedWith(ServerError.class).to(ParseS3ErrorFromXmlContent.class);
}

protected void bindRequestSigner() {
bind(RequestAuthorizeSignature.class).to(RequestAuthorizeSignature.RequestAuthorizeSignatureV2.class).in(Scopes.SINGLETON);
}

@Provides
@Singleton
protected RequestSigner provideRequestSigner(RequestAuthorizeSignature in) {
if (in instanceof RequestSigner) {
return (RequestSigner) in;
}
return new RequestSigner() {
@Override
public String toString() {
return "noRegions()";
public String createStringToSign(HttpRequest input) {
return null;
}
};
} else if (regions.size() == 1) {
final String onlyRegion = Iterables.getOnlyElement(regions);
return new CacheLoader<String, Optional<String>>() {
Optional<String> onlyRegionOption = Optional.of(onlyRegion);

@Override
public Optional<String> load(String bucket) {
return onlyRegionOption;
public String sign(String toSign) {
return null;
}

@Override
public String toString() {
return "onlyRegion(" + onlyRegion + ")";
}
};
} else {
return new CacheLoader<String, Optional<String>>() {
@Override
public Optional<String> load(String bucket) {
try {
return Optional.fromNullable(client.getBucketLocation(bucket));
} catch (ContainerNotFoundException e) {
return null;
}
};
}

@Override
protected void bindRetryHandlers() {
bind(HttpRetryHandler.class).annotatedWith(Redirection.class).to(S3RedirectionRetryHandler.class);
bind(HttpRetryHandler.class).annotatedWith(ClientError.class).to(AWSClientErrorRetryHandler.class);
bind(HttpRetryHandler.class).annotatedWith(ServerError.class).to(AWSServerErrorRetryHandler.class);
}

@Provides
@TimeStamp
protected String provideTimeStamp(@TimeStamp Supplier<String> cache) {
return cache.get();
}


/**
* borrowing concurrency code to ensure that caching takes place properly
*/
@Provides
@TimeStamp
@Singleton
protected Supplier<String> provideTimeStampCache(@Named(Constants.PROPERTY_SESSION_INTERVAL) long seconds,
final DateService dateService) {
return Suppliers.memoizeWithExpiration(new Supplier<String>() {
public String get() {
return dateService.rfc822DateFormat();
}

@Override
public String toString() {
return "bucketToRegion()";
}, seconds, TimeUnit.SECONDS);
}


@Provides
@TimeStamp
protected Date provideTimeStampDate(@TimeStamp Supplier<Date> cache) {
return cache.get();
}

/**
* borrowing concurrency code to ensure that caching takes place properly
*/
@Provides
@TimeStamp
@Singleton
protected Supplier<Date> provideTimeStampCacheDate(
@Named(Constants.PROPERTY_SESSION_INTERVAL) long seconds,
@TimeStamp final Supplier<String> timestamp,
final DateService dateService) {
return Suppliers.memoizeWithExpiration(new Supplier<Date>() {
public Date get() {
return dateService.rfc822DateParse(timestamp.get());
}
};
}
}

@Provides
@Bucket
@Singleton
protected LoadingCache<String, Optional<String>> bucketToRegion(@Bucket CacheLoader<String, Optional<String>> loader) {
return CacheBuilder.newBuilder().build(loader);
}

@Provides
@Bucket
@Singleton
protected Supplier<String> defaultRegionForBucket(@Region Supplier<String> defaultRegion) {
return defaultRegion;
}

@Provides
@Singleton
@Bucket
protected Supplier<URI> provideBucketURI(@Bucket Supplier<String> defaultRegion,
RegionToEndpointOrProviderIfNull regionToEndpoint) {
return Suppliers.compose(regionToEndpoint, defaultRegion);
}

@Override
protected void configure() {
super.configure();
install(new S3ObjectModule());
install(new S3ParserModule());
bindRequestSigner();
bind(new TypeLiteral<Function<String, Optional<String>>>() {
}).annotatedWith(Bucket.class).to(GetRegionForBucket.class);
bind(new TypeLiteral<Function<Set<BucketMetadata>, PageSet<? extends StorageMetadata>>>() {
}).to(BucketsToStorageMetadata.class);
}

@Override
protected void bindErrorHandlers() {
bind(HttpErrorHandler.class).annotatedWith(Redirection.class).to(ParseS3ErrorFromXmlContent.class);
bind(HttpErrorHandler.class).annotatedWith(ClientError.class).to(ParseS3ErrorFromXmlContent.class);
bind(HttpErrorHandler.class).annotatedWith(ServerError.class).to(ParseS3ErrorFromXmlContent.class);
}

protected void bindRequestSigner() {
bind(RequestAuthorizeSignature.class).in(Scopes.SINGLETON);
}

@Provides
@Singleton
protected RequestSigner provideRequestSigner(RequestAuthorizeSignature in) {
return in;
}

@Override
protected void bindRetryHandlers() {
bind(HttpRetryHandler.class).annotatedWith(Redirection.class).to(S3RedirectionRetryHandler.class);
bind(HttpRetryHandler.class).annotatedWith(ClientError.class).to(AWSClientErrorRetryHandler.class);
bind(HttpRetryHandler.class).annotatedWith(ServerError.class).to(AWSServerErrorRetryHandler.class);
}

@Provides
@TimeStamp
protected String provideTimeStamp(@TimeStamp Supplier<String> cache) {
return cache.get();
}

/**
* borrowing concurrency code to ensure that caching takes place properly
*/
@Provides
@TimeStamp
@Singleton
protected Supplier<String> provideTimeStampCache(@Named(Constants.PROPERTY_SESSION_INTERVAL) long seconds,
final DateService dateService) {
return Suppliers.memoizeWithExpiration(new Supplier<String>() {
public String get() {
return dateService.rfc822DateFormat();
}
}, seconds, TimeUnit.SECONDS);
}
}, seconds, TimeUnit.SECONDS);
}
}