Default Swift signer timeout to 15 minutes

This matches other providers.
This commit is contained in:
Andrew Gaul 2017-04-18 18:49:02 -07:00
parent b424a6c164
commit 3a1710d15c
1 changed files with 6 additions and 6 deletions

View File

@ -43,7 +43,7 @@ import com.google.inject.name.Named;
/** /**
* Uses {@link TemporaryUrlSigner} to sign requests for access to blobs. If no * Uses {@link TemporaryUrlSigner} to sign requests for access to blobs. If no
* interval is supplied, it defaults to a year. * interval is supplied, it defaults to a 15 minutes.
*/ */
public class RegionScopedTemporaryUrlBlobSigner implements BlobRequestSigner { public class RegionScopedTemporaryUrlBlobSigner implements BlobRequestSigner {
@ -57,7 +57,7 @@ public class RegionScopedTemporaryUrlBlobSigner implements BlobRequestSigner {
this.storageUrl = regionToUris.get().get(regionId).get(); this.storageUrl = regionToUris.get().get(regionId).get();
} }
private static final long YEAR = TimeUnit.DAYS.toSeconds(365); private static final long DEFAULT_SIGNING_TIMEOUT = TimeUnit.MINUTES.toSeconds(15);
private final BlobToHttpGetOptions toGetOptions = new BlobToHttpGetOptions(); private final BlobToHttpGetOptions toGetOptions = new BlobToHttpGetOptions();
private final Provider<Long> timestamp; private final Provider<Long> timestamp;
private final TemporaryUrlSigner signer; private final TemporaryUrlSigner signer;
@ -65,7 +65,7 @@ public class RegionScopedTemporaryUrlBlobSigner implements BlobRequestSigner {
@Override @Override
public HttpRequest signGetBlob(String container, String name) { public HttpRequest signGetBlob(String container, String name) {
return signGetBlob(container, name, YEAR); return signGetBlob(container, name, DEFAULT_SIGNING_TIMEOUT);
} }
@Override @Override
@ -75,12 +75,12 @@ public class RegionScopedTemporaryUrlBlobSigner implements BlobRequestSigner {
@Override @Override
public HttpRequest signGetBlob(String container, String name, org.jclouds.blobstore.options.GetOptions options) { public HttpRequest signGetBlob(String container, String name, org.jclouds.blobstore.options.GetOptions options) {
return sign("GET", container, name, toGetOptions.apply(options), timestamp.get() + YEAR); return sign("GET", container, name, toGetOptions.apply(options), timestamp.get() + DEFAULT_SIGNING_TIMEOUT);
} }
@Override @Override
public HttpRequest signPutBlob(String container, Blob blob) { public HttpRequest signPutBlob(String container, Blob blob) {
return signPutBlob(container, blob, YEAR); return signPutBlob(container, blob, DEFAULT_SIGNING_TIMEOUT);
} }
@Override @Override
@ -91,7 +91,7 @@ public class RegionScopedTemporaryUrlBlobSigner implements BlobRequestSigner {
@Deprecated @Deprecated
@Override @Override
public HttpRequest signRemoveBlob(String container, String name) { public HttpRequest signRemoveBlob(String container, String name) {
return sign("DELETE", container, name, GetOptions.NONE, timestamp.get() + YEAR); return sign("DELETE", container, name, GetOptions.NONE, timestamp.get() + DEFAULT_SIGNING_TIMEOUT);
} }
private HttpRequest sign(String method, String container, String name, GetOptions options, long expires) { private HttpRequest sign(String method, String container, String name, GetOptions options, long expires) {