Apache/jclouds
1
0
Fork 0
mirror of https://github.com/apache/jclouds.git synced 2025-02-06 18:19:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add ETag to failed conditional GETs in LocalBlobStore

Browse Source
This commit is contained in:
Andrew Gaul 2024-09-04 23:42:25 +02:00
parent d62322c2ac
commit 9b48d04502
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
blobstore/pom.xml
View File

@ -42,6 +42,10 @@
<artifactId>jclouds-core</artifactId> <artifactId>jclouds-core</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
</dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>jclouds-core</artifactId> <artifactId>jclouds-core</artifactId>

27
blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java
View File

@ -42,6 +42,7 @@ import java.util.UUID;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import jakarta.ws.rs.core.Response.Status;
import jakarta.inject.Inject; import jakarta.inject.Inject;
import jakarta.inject.Singleton; import jakarta.inject.Singleton;
@ -640,29 +641,39 @@ public final class LocalBlobStore implements BlobStore {
if (eTag != null) { if (eTag != null) {
eTag = maybeQuoteETag(eTag); eTag = maybeQuoteETag(eTag);
if (options.getIfMatch() != null) { if (options.getIfMatch() != null) {
if (!eTag.equals(maybeQuoteETag(options.getIfMatch()))) if (!eTag.equals(maybeQuoteETag(options.getIfMatch()))) {
throw returnResponseException(412); HttpResponse response = HttpResponse.builder().statusCode(Status.PRECONDITION_FAILED.getStatusCode()).addHeader(HttpHeaders.ETAG, eTag).build();
throw new HttpResponseException(new HttpCommand(HttpRequest.builder().method("GET").endpoint("http://stub").build()), response);
}
} }
if (options.getIfNoneMatch() != null) { if (options.getIfNoneMatch() != null) {
if (eTag.equals(maybeQuoteETag(options.getIfNoneMatch()))) if (eTag.equals(maybeQuoteETag(options.getIfNoneMatch()))) {
throw returnResponseException(304); HttpResponse response = HttpResponse.builder().statusCode(Status.NOT_MODIFIED.getStatusCode()).addHeader(HttpHeaders.ETAG, eTag).build();
throw new HttpResponseException(new HttpCommand(HttpRequest.builder().method("GET").endpoint("http://stub").build()), response);
}
} }
} }
if (options.getIfModifiedSince() != null) { if (options.getIfModifiedSince() != null) {
Date modifiedSince = options.getIfModifiedSince(); Date modifiedSince = options.getIfModifiedSince();
if (blob.getMetadata().getLastModified().before(modifiedSince)) { if (blob.getMetadata().getLastModified().before(modifiedSince)) {
HttpResponse response = HttpResponse.builder().statusCode(304).build(); HttpResponse.Builder response = HttpResponse.builder().statusCode(Status.NOT_MODIFIED.getStatusCode());
if (eTag != null) {
response.addHeader(HttpHeaders.ETAG, eTag);
}
throw new HttpResponseException(String.format("%1$s is before %2$s", blob throw new HttpResponseException(String.format("%1$s is before %2$s", blob
.getMetadata().getLastModified(), modifiedSince), null, response); .getMetadata().getLastModified(), modifiedSince), null, response.build());
} }
} }
if (options.getIfUnmodifiedSince() != null) { if (options.getIfUnmodifiedSince() != null) {
Date unmodifiedSince = options.getIfUnmodifiedSince(); Date unmodifiedSince = options.getIfUnmodifiedSince();
if (blob.getMetadata().getLastModified().after(unmodifiedSince)) { if (blob.getMetadata().getLastModified().after(unmodifiedSince)) {
HttpResponse response = HttpResponse.builder().statusCode(412).build(); HttpResponse.Builder response = HttpResponse.builder().statusCode(Status.PRECONDITION_FAILED.getStatusCode());
if (eTag != null) {
response.addHeader(HttpHeaders.ETAG, eTag);
}
throw new HttpResponseException(String.format("%1$s is after %2$s", blob throw new HttpResponseException(String.format("%1$s is after %2$s", blob
.getMetadata().getLastModified(), unmodifiedSince), null, response); .getMetadata().getLastModified(), unmodifiedSince), null, response.build());
} }
} }
blob = copyBlob(blob); blob = copyBlob(blob);