Light, fluffy, and always free - The AWS Local Emulator alternative
fix(s3): answer InvalidRequest for CompleteMultipartUpload with no parts (#5759)
Matheus Oliveiraeca2199de68d
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.javaindex 663e24f9b2..137e3f36d9 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@@ -1903,7 +1903,13 @@ public class S3Controller {private List<CompletedPart> parseCompleteMultipartBody(String xml) {List<Map<String, String>> parts = XmlParser.extractGroups(xml, "Part");if (parts.isEmpty()) {- throw malformedCompleteMultipartXml();+ if (xml == null || xml.isEmpty()) {+ throw emptyCompleteMultipartXml();+ }+ if (!"CompleteMultipartUpload".equals(XmlParser.rootElementName(xml))) {+ throw malformedCompleteMultipartXml();+ }+ throw emptyCompleteMultipartXml();}List<CompletedPart> completedParts = new ArrayList<>();for (Map<String, String> part : parts) {@@ -1927,6 +1933,10 @@ public class S3Controller {return new AwsException("MalformedXML", "The XML you provided was not well-formed.", 400);}+ private static AwsException emptyCompleteMultipartXml() {+ return new AwsException("InvalidRequest", "You must specify at least one part", 400);+ }+private Map<Integer, S3Checksum> completedPartChecksums(List<CompletedPart> parts) {Map<Integer, S3Checksum> checksums = new HashMap<>();for (CompletedPart part : parts) {diff --git a/src/test/java/io/github/hectorvent/floci/services/s3/S3MultipartIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/s3/S3MultipartIntegrationTest.javaindex d3a51a6a38..526aacd2f7 100644--- a/src/test/java/io/github/hectorvent/floci/services/s3/S3MultipartIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/s3/S3MultipartIntegrationTest.java@@ -118,6 +118,70 @@ class S3MultipartIntegrationTest {.body(containsString("<Key>" + KEY + "</Key>"));}+ @Test+ @Order(7)+ void completeMultipartUploadWithoutPartsIsInvalidRequest() {+ String key = "no-parts-complete.bin";+ String newUploadId = given()+ .when()+ .post("/" + BUCKET + "/" + key + "?uploads")+ .then()+ .statusCode(200)+ .extract().xmlPath().getString("InitiateMultipartUploadResult.UploadId");++ // The CLI omits --multipart-upload and sends an empty body; the SDKs send an empty+ // element. AWS answers both with InvalidRequest, while non-XML stays MalformedXML.+ given()+ .contentType("application/xml")+ .body("")+ .when()+ .post("/" + BUCKET + "/" + key + "?uploadId=" + newUploadId)+ .then()+ .statusCode(400)+ .body("Error.Code", equalTo("InvalidRequest"))+ .body("Error.Message", equalTo("You must specify at least one part"));++ given()+ .contentType("application/xml")+ .body("<CompleteMultipartUpload/>")+ .when()+ .post("/" + BUCKET + "/" + key + "?uploadId=" + newUploadId)+ .then()+ .statusCode(400)+ .body("Error.Code", equalTo("InvalidRequest"))+ .body("Error.Message", equalTo("You must specify at least one part"));++ given()+ .contentType("application/xml")+ .body("<CompleteMultipartUpload></CompleteMultipartUpload>")+ .when()+ .post("/" + BUCKET + "/" + key + "?uploadId=" + newUploadId)+ .then()+ .statusCode(400)+ .body("Error.Code", equalTo("InvalidRequest"))+ .body("Error.Message", equalTo("You must specify at least one part"));++ given()+ .contentType("application/xml")+ .body(" \n ")+ .when()+ .post("/" + BUCKET + "/" + key + "?uploadId=" + newUploadId)+ .then()+ .statusCode(400)+ .body("Error.Code", equalTo("MalformedXML"));++ given()+ .contentType("application/xml")+ .body("<CompleteMultipartUpload><Part></CompleteMultipartUpload>")+ .when()+ .post("/" + BUCKET + "/" + key + "?uploadId=" + newUploadId)+ .then()+ .statusCode(400)+ .body("Error.Code", equalTo("MalformedXML"));++ given().when().delete("/" + BUCKET + "/" + key + "?uploadId=" + newUploadId).then().statusCode(204);+ }+@Test@Order(8)void completeMultipartUpload() {