Skip to content

armgit / floci

Public Imported from GitHub
0

Light, fluffy, and always free - The AWS Local Emulator alternative

fix(s3): handle empty object suffix ranges (#1142)

David Phillips6b92d2954b19
diff --git a/src/main/java/io/github/hectorvent/floci/services/s3/S3Controller.java b/src/main/java/io/github/hectorvent/floci/services/s3/S3Controller.java
index cc0e2dba89..c1f55f1e1b 100644
--- a/src/main/java/io/github/hectorvent/floci/services/s3/S3Controller.java
+++ b/src/main/java/io/github/hectorvent/floci/services/s3/S3Controller.java
@@ -594,22 +594,26 @@ public class S3Controller {
return handleRangeRequest(obj, rangeHeader, overrides);
}
- var resp = Response.ok(obj.getData())
- .header("Content-Type", overrides.contentType() != null ? overrides.contentType() : obj.getContentType())
- .header("Content-Length", obj.getSize())
- .header("ETag", obj.getETag())
- .header("Last-Modified", RFC_822.format(obj.getLastModified()))
- .header("Accept-Ranges", "bytes");
- if (obj.getVersionId() != null) {
- resp.header("x-amz-version-id", obj.getVersionId());
- }
- appendObjectHeaders(resp, obj, overrides);
- return resp.build();
+ return fullObjectResponse(obj, overrides);
} catch (AwsException e) {
return xmlErrorResponse(e);
}
}
+ private Response fullObjectResponse(S3Object obj, ResponseHeaderOverrides overrides) {
+ var resp = Response.ok(obj.getData())
+ .header("Content-Type", overrides.contentType() != null ? overrides.contentType() : obj.getContentType())
+ .header("Content-Length", obj.getSize())
+ .header("ETag", obj.getETag())
+ .header("Last-Modified", RFC_822.format(obj.getLastModified()))
+ .header("Accept-Ranges", "bytes");
+ if (obj.getVersionId() != null) {
+ resp.header("x-amz-version-id", obj.getVersionId());
+ }
+ appendObjectHeaders(resp, obj, overrides);
+ return resp.build();
+ }
+
private Response handleRangeRequest(S3Object obj, String rangeHeader, ResponseHeaderOverrides overrides) {
byte[] data = obj.getData();
int totalSize = data.length;
@@ -642,6 +646,9 @@ public class S3Controller {
}
if (start < 0 || start >= totalSize || start > end) {
+ if (totalSize == 0 && rangeSpec.startsWith("-")) {
+ return fullObjectResponse(obj, overrides);
+ }
return invalidRangeResponse(totalSize);
}
diff --git a/src/test/java/io/github/hectorvent/floci/services/s3/S3IntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/s3/S3IntegrationTest.java
index 35e7615cb9..ccd8888dab 100644
--- a/src/test/java/io/github/hectorvent/floci/services/s3/S3IntegrationTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/s3/S3IntegrationTest.java
@@ -590,6 +590,35 @@ class S3IntegrationTest {
.header("x-amz-checksum-crc64nvme", nullValue());
}
+ @Test
+ @Order(41)
+ void getObjectWithSuffixRangeForEmptyObject() {
+ given()
+ .header("x-amz-meta-kind", "empty")
+ .body(new byte[0])
+ .when()
+ .put("/test-bucket/empty.txt")
+ .then()
+ .statusCode(200);
+
+ given()
+ .header("Range", "bytes=-13")
+ .when()
+ .get("/test-bucket/empty.txt")
+ .then()
+ .statusCode(200)
+ .header("Content-Length", equalTo("0"))
+ .header("Accept-Ranges", equalTo("bytes"))
+ .header("x-amz-meta-kind", equalTo("empty"))
+ .body(equalTo(""));
+
+ given()
+ .when()
+ .delete("/test-bucket/empty.txt")
+ .then()
+ .statusCode(204);
+ }
+
@Test
@Order(50)
void getObjectIfNoneMatchReturns304() {