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

JCLOUDS-1110: Inject timeStamp into Atmos provider 

This addresses a unit test failure.
This commit is contained in:
Andrew Gaul 2017-11-14 10:46:54 -08:00
parent fda87d7dc7
commit a62494a117
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosBlobRequestSigner.java
View File

@ -21,6 +21,7 @@ import static org.jclouds.blobstore.util.BlobStoreUtils.cleanRequest;
import static org.jclouds.reflect.Reflection2.method;
import java.net.URI;
import java.util.Date;
import javax.inject.Inject;
import javax.inject.Singleton;
@ -33,17 +34,19 @@ import org.jclouds.atmos.options.PutOptions;
import org.jclouds.blobstore.BlobRequestSigner;
import org.jclouds.blobstore.domain.Blob;
import org.jclouds.blobstore.functions.BlobToHttpGetOptions;
import org.jclouds.date.DateService;
import org.jclouds.date.TimeStamp;
import org.jclouds.domain.Credentials;
import org.jclouds.http.HttpRequest;
import org.jclouds.http.Uris;
import org.jclouds.http.options.GetOptions;
import org.jclouds.location.Provider;
import org.jclouds.reflect.Invocation;
import com.google.common.base.Function;
import com.google.common.base.Supplier;
import com.google.common.collect.ImmutableList;
import com.google.common.reflect.Invokable;
import com.google.inject.Provider;
@Singleton
public class AtmosBlobRequestSigner implements BlobRequestSigner {
@ -60,11 +63,15 @@ public class AtmosBlobRequestSigner implements BlobRequestSigner {
private final SignRequest signer;
private final URI endpoint;
private final String identity;
private final DateService dateService;
private final Provider<String> timeStampProvider;
@Inject
public AtmosBlobRequestSigner(Function<Invocation, HttpRequest> processor, BlobToObject blobToObject,
BlobToHttpGetOptions blob2ObjectGetOptions, SignRequest signer,
@Provider Supplier<URI> endpointProvider, @Provider Supplier<Credentials> creds)
@org.jclouds.location.Provider Supplier<URI> endpointProvider,
@org.jclouds.location.Provider Supplier<Credentials> creds,
DateService dateService, @TimeStamp Provider<String> timeStampProvider)
throws SecurityException, NoSuchMethodException {
this.processor = checkNotNull(processor, "processor");
this.blobToObject = checkNotNull(blobToObject, "blobToObject");
@ -75,6 +82,8 @@ public class AtmosBlobRequestSigner implements BlobRequestSigner {
this.signer = signer;
this.endpoint = endpointProvider.get();
this.identity = creds.get().identity;
this.dateService = dateService;
this.timeStampProvider = timeStampProvider;
}
@Override
@ -124,7 +133,8 @@ public class AtmosBlobRequestSigner implements BlobRequestSigner {
}
private HttpRequest sign(String method, String path, long timeInSeconds) {
String expires = String.valueOf(System.currentTimeMillis() / 1000 + timeInSeconds);
Date now = dateService.rfc1123DateParse(timeStampProvider.get());
String expires = String.valueOf(now.getTime() / 1000 + timeInSeconds);
String stringToSign = method + "\n" +
path + "\n" +
identity + "\n" +

6
apis/atmos/src/test/java/org/jclouds/atmos/blobstore/AtmosBlobRequestSignerTest.java
View File

@ -59,10 +59,8 @@ public class AtmosBlobRequestSignerTest extends BaseRestAnnotationProcessingTest
NoSuchMethodException, IOException {
HttpRequest request = signer.signGetBlob("container", "name");
assertRequestLineEquals(request, "GET https://accesspoint.atmosonline.com/rest/namespace/container/name HTTP/1.1");
assertNonPayloadHeadersEqual(
request,
"Accept: */*\nDate: Thu, 05 Jun 2008 16:38:19 GMT\nx-emc-signature: DHDKwV6IPsJJvtrI9ktTiKq9us4=\nx-emc-uid: identity\n");
assertRequestLineEquals(request, "GET https://accesspoint.atmosonline.com/rest/namespace/container/name?uid=identity&expires=1212684799&signature=oijXdvPjHQ/LwWDcdx9Eozsu77o%3D HTTP/1.1");
assertNonPayloadHeadersEqual(request, "");
assertPayloadEquals(request, null, null, false);
assertEquals(request.getFilters().size(), 0);