Skip to content

armgit / floci

Public Imported from GitHub
0

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

feat(s3): add Range header support for GetObject (#44)

Roberto Perez Alcoleab0f5ae22cd9b
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 1267e71561..71d0cc0341 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
@@ -368,6 +368,7 @@ public class S3Controller {
@HeaderParam("If-None-Match") String ifNoneMatch,
@HeaderParam("If-Modified-Since") String ifModifiedSince,
@HeaderParam("If-Unmodified-Since") String ifUnmodifiedSince,
+ @HeaderParam("Range") String rangeHeader,
@Context UriInfo uriInfo,
@Context HttpHeaders httpHeaders) {
try {
@@ -399,11 +400,17 @@ public class S3Controller {
}
}
S3Object obj = s3Service.getObject(bucket, key, versionId);
+
+ if (rangeHeader != null && rangeHeader.startsWith("bytes=")) {
+ return handleRangeRequest(obj, rangeHeader);
+ }
+
var resp = Response.ok(obj.getData())
.header("Content-Type", obj.getContentType())
.header("Content-Length", obj.getSize())
.header("ETag", obj.getETag())
- .header("Last-Modified", RFC_822.format(obj.getLastModified()));
+ .header("Last-Modified", RFC_822.format(obj.getLastModified()))
+ .header("Accept-Ranges", "bytes");
if (obj.getVersionId() != null) {
resp.header("x-amz-version-id", obj.getVersionId());
}
@@ -414,6 +421,69 @@ public class S3Controller {
}
}
+ private Response handleRangeRequest(S3Object obj, String rangeHeader) {
+ byte[] data = obj.getData();
+ int totalSize = data.length;
+ String rangeSpec = rangeHeader.substring("bytes=".length()).trim();
+
+ int start, end;
+ try {
+ int dash = rangeSpec.indexOf('-');
+ if (dash < 0) {
+ return invalidRangeResponse(totalSize);
+ }
+ String before = rangeSpec.substring(0, dash);
+ String after = rangeSpec.substring(dash + 1);
+ if (before.isEmpty() && after.isEmpty()) {
+ return invalidRangeResponse(totalSize);
+ }
+ if (before.isEmpty()) {
+ int suffix = Integer.parseInt(after);
+ if (suffix <= 0) {
+ return invalidRangeResponse(totalSize);
+ }
+ start = Math.max(0, totalSize - suffix);
+ end = totalSize - 1;
+ } else {
+ start = Integer.parseInt(before);
+ end = after.isEmpty() ? totalSize - 1 : Math.min(Integer.parseInt(after), totalSize - 1);
+ }
+ } catch (NumberFormatException e) {
+ return invalidRangeResponse(totalSize);
+ }
+
+ if (start < 0 || start >= totalSize || start > end) {
+ return invalidRangeResponse(totalSize);
+ }
+
+ byte[] rangeData = java.util.Arrays.copyOfRange(data, start, end + 1);
+ return Response.status(206)
+ .entity(rangeData)
+ .header("Content-Type", obj.getContentType())
+ .header("Content-Length", rangeData.length)
+ .header("Content-Range", "bytes " + start + "-" + end + "/" + totalSize)
+ .header("ETag", obj.getETag())
+ .header("Last-Modified", RFC_822.format(obj.getLastModified()))
+ .header("Accept-Ranges", "bytes")
+ .build();
+ }
+
+ private Response invalidRangeResponse(int totalSize) {
+ String xml = new XmlBuilder()
+ .raw("<?xml version=\"1.0\" encoding=\"UTF-8\"?>")
+ .start("Error")
+ .elem("Code", "InvalidRange")
+ .elem("Message", "The requested range is not satisfiable.")
+ .elem("RequestId", java.util.UUID.randomUUID().toString())
+ .end("Error")
+ .build();
+ return Response.status(416)
+ .entity(xml)
+ .type(MediaType.APPLICATION_XML)
+ .header("Content-Range", "bytes */" + totalSize)
+ .build();
+ }
+
@HEAD
@Path("/{bucket}/{key:.+}")
public Response headObject(@PathParam("bucket") String bucket,
@@ -433,7 +503,8 @@ public class S3Controller {
.header("Content-Type", obj.getContentType())
.header("Content-Length", obj.getSize())
.header("ETag", obj.getETag())
- .header("Last-Modified", RFC_822.format(obj.getLastModified()));
+ .header("Last-Modified", RFC_822.format(obj.getLastModified()))
+ .header("Accept-Ranges", "bytes");
if (obj.getVersionId() != null) {
resp.header("x-amz-version-id", obj.getVersionId());
}
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 ec27cc05b2..4dfff4bb95 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
@@ -211,6 +211,130 @@ class S3IntegrationTest {
.body(containsString("BucketNotEmpty"));
}
+ @Test
+ @Order(30)
+ void getObjectWithFullRange() {
+ given()
+ .header("Range", "bytes=0-4")
+ .when()
+ .get("/test-bucket/greeting.txt")
+ .then()
+ .statusCode(206)
+ .header("Content-Range", equalTo("bytes 0-4/20"))
+ .header("Content-Length", equalTo("5"))
+ .header("Accept-Ranges", equalTo("bytes"))
+ .body(equalTo("Hello"));
+ }
+
+ @Test
+ @Order(31)
+ void getObjectWithOpenEndedRange() {
+ given()
+ .header("Range", "bytes=15-")
+ .when()
+ .get("/test-bucket/greeting.txt")
+ .then()
+ .statusCode(206)
+ .header("Content-Range", equalTo("bytes 15-19/20"))
+ .body(equalTo("m S3!"));
+ }
+
+ @Test
+ @Order(32)
+ void getObjectWithSuffixRange() {
+ given()
+ .header("Range", "bytes=-4")
+ .when()
+ .get("/test-bucket/greeting.txt")
+ .then()
+ .statusCode(206)
+ .header("Content-Range", equalTo("bytes 16-19/20"))
+ .body(equalTo(" S3!"));
+ }
+
+ @Test
+ @Order(33)
+ void getObjectWithInvalidRange() {
+ given()
+ .header("Range", "bytes=50-100")
+ .when()
+ .get("/test-bucket/greeting.txt")
+ .then()
+ .statusCode(416)
+ .header("Content-Range", equalTo("bytes */20"))
+ .body(containsString("InvalidRange"));
+ }
+
+ @Test
+ @Order(34)
+ void getObjectWithMalformedRangeNoDash() {
+ given()
+ .header("Range", "bytes=0")
+ .when()
+ .get("/test-bucket/greeting.txt")
+ .then()
+ .statusCode(416)
+ .body(containsString("InvalidRange"));
+ }
+
+ @Test
+ @Order(35)
+ void getObjectWithMalformedRangeEmptySuffix() {
+ given()
+ .header("Range", "bytes=-")
+ .when()
+ .get("/test-bucket/greeting.txt")
+ .then()
+ .statusCode(416)
+ .body(containsString("InvalidRange"));
+ }
+
+ @Test
+ @Order(36)
+ void getObjectWithMalformedRangeNonNumeric() {
+ given()
+ .header("Range", "bytes=abc-def")
+ .when()
+ .get("/test-bucket/greeting.txt")
+ .then()
+ .statusCode(416)
+ .body(containsString("InvalidRange"));
+ }
+
+ @Test
+ @Order(37)
+ void getObjectWithMalformedRangeNegativeStart() {
+ given()
+ .header("Range", "bytes=-1-4")
+ .when()
+ .get("/test-bucket/greeting.txt")
+ .then()
+ .statusCode(416)
+ .body(containsString("InvalidRange"));
+ }
+
+ @Test
+ @Order(38)
+ void getObjectWithoutRangeReturnsAcceptRanges() {
+ given()
+ .when()
+ .get("/test-bucket/greeting.txt")
+ .then()
+ .statusCode(200)
+ .header("Accept-Ranges", equalTo("bytes"));
+ }
+
+ @Test
+ @Order(39)
+ void headObjectReturnsAcceptRanges() {
+ given()
+ .when()
+ .head("/test-bucket/greeting.txt")
+ .then()
+ .statusCode(200)
+ .header("Accept-Ranges", equalTo("bytes"));
+ }
+
@Test
@Order(50)
void getObjectIfNoneMatchReturns304() {