From 2e7de9f850bfc699ccd4df313c3dfe42be87f501 Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Wed, 19 Apr 2017 18:08:52 -0700 Subject: [PATCH] JCLOUDS-1271: Deprecate signRemoveBlob URL signing should always use authentication parameters instead of headers yet no provider supports DELETEs with the former. --- .../java/org/jclouds/atmos/blobstore/AtmosBlobRequestSigner.java | 1 + .../swift/v1/blobstore/RegionScopedTemporaryUrlBlobSigner.java | 1 + .../main/java/org/jclouds/s3/blobstore/S3BlobRequestSigner.java | 1 + .../src/main/java/org/jclouds/blobstore/BlobRequestSigner.java | 1 + .../main/java/org/jclouds/blobstore/LocalBlobRequestSigner.java | 1 + .../jclouds/blobstore/internal/RequestSigningUnsupported.java | 1 + .../org/jclouds/azureblob/blobstore/AzureBlobRequestSigner.java | 1 + 7 files changed, 7 insertions(+) diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosBlobRequestSigner.java b/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosBlobRequestSigner.java index 8563222428..0d9b5c6620 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosBlobRequestSigner.java +++ b/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosBlobRequestSigner.java @@ -85,6 +85,7 @@ public class AtmosBlobRequestSigner implements BlobRequestSigner { throw new UnsupportedOperationException(); } + @Deprecated @Override public HttpRequest signRemoveBlob(String container, String name) { checkNotNull(container, "container"); diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedTemporaryUrlBlobSigner.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedTemporaryUrlBlobSigner.java index 5134efae34..c227e042e5 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedTemporaryUrlBlobSigner.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedTemporaryUrlBlobSigner.java @@ -88,6 +88,7 @@ public class RegionScopedTemporaryUrlBlobSigner implements BlobRequestSigner { return sign("PUT", container, blob.getMetadata().getName(), GetOptions.NONE, timestamp.get() + timeInSeconds); } + @Deprecated @Override public HttpRequest signRemoveBlob(String container, String name) { return sign("DELETE", container, name, GetOptions.NONE, timestamp.get() + YEAR); diff --git a/apis/s3/src/main/java/org/jclouds/s3/blobstore/S3BlobRequestSigner.java b/apis/s3/src/main/java/org/jclouds/s3/blobstore/S3BlobRequestSigner.java index e110012527..015b5e621f 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/blobstore/S3BlobRequestSigner.java +++ b/apis/s3/src/main/java/org/jclouds/s3/blobstore/S3BlobRequestSigner.java @@ -95,6 +95,7 @@ public class S3BlobRequestSigner implements BlobRequestSigne return cleanRequest(authSigner.signForTemporaryAccess(request, timeInSeconds)); } + @Deprecated @Override public HttpRequest signRemoveBlob(String container, String name) { checkNotNull(container, "container"); diff --git a/blobstore/src/main/java/org/jclouds/blobstore/BlobRequestSigner.java b/blobstore/src/main/java/org/jclouds/blobstore/BlobRequestSigner.java index 8464dad3dc..a86a84a490 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/BlobRequestSigner.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/BlobRequestSigner.java @@ -71,6 +71,7 @@ public interface BlobRequestSigner { * @throws UnsupportedOperationException * if not supported by the provider */ + @Deprecated HttpRequest signRemoveBlob(String container, String name); /** diff --git a/blobstore/src/main/java/org/jclouds/blobstore/LocalBlobRequestSigner.java b/blobstore/src/main/java/org/jclouds/blobstore/LocalBlobRequestSigner.java index 3c54f4bbd6..13f8520223 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/LocalBlobRequestSigner.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/LocalBlobRequestSigner.java @@ -75,6 +75,7 @@ public class LocalBlobRequestSigner implements BlobRequestSigner { throw new UnsupportedOperationException(); } + @Deprecated @Override public HttpRequest signRemoveBlob(String container, String name) { HttpRequest request = HttpRequest.builder().method("DELETE").endpoint(String.format("%s/%s/%s", endpoint.get(), container, diff --git a/blobstore/src/main/java/org/jclouds/blobstore/internal/RequestSigningUnsupported.java b/blobstore/src/main/java/org/jclouds/blobstore/internal/RequestSigningUnsupported.java index 7770525852..b3de332f9c 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/internal/RequestSigningUnsupported.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/internal/RequestSigningUnsupported.java @@ -41,6 +41,7 @@ public class RequestSigningUnsupported implements BlobRequestSigner { throw new UnsupportedOperationException(); } + @Deprecated @Override public HttpRequest signRemoveBlob(String container, String name) { throw new UnsupportedOperationException(); diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/AzureBlobRequestSigner.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/AzureBlobRequestSigner.java index 7a365ed554..38fe95b860 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/AzureBlobRequestSigner.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/AzureBlobRequestSigner.java @@ -83,6 +83,7 @@ public class AzureBlobRequestSigner implements BlobRequestSigner { throw new UnsupportedOperationException(); } + @Deprecated @Override public HttpRequest signRemoveBlob(String container, String name) { checkNotNull(container, "container");