Light, fluffy, and always free - The AWS Local Emulator alternative
fix(s3): delete null object versions (#3867)
Vũ Thế Huycaab63c602fe
diff --git a/src/main/java/io/github/hectorvent/floci/services/s3/S3Service.java b/src/main/java/io/github/hectorvent/floci/services/s3/S3Service.javaindex 92123cd98e..ab8c89aac2 100644--- a/src/main/java/io/github/hectorvent/floci/services/s3/S3Service.java+++ b/src/main/java/io/github/hectorvent/floci/services/s3/S3Service.java@@ -1237,6 +1237,15 @@ public class S3Service implements Resettable, ResourceProvider {}public S3Object getObject(String bucketName, String key, String versionId) {+ if ("null".equals(versionId)) {+ String bucketOwnerAccount = resolveBucketEntry(bucketName)+ .orElseThrow(() -> new AwsException("NoSuchBucket",+ "The specified bucket does not exist.", 404))+ .account();+ S3Object obj = getObjectMetadata(bucketName, key, versionId);+ obj.setData(readFile(bucketOwnerAccount, bucketName, key));+ return obj;+ }if (versionId != null) {// An explicit version's file is immutable once written (see storeObjectInternal) and// never reused by a later PUT, so this pairing can never race a concurrent overwrite.@@ -1330,7 +1339,7 @@ public class S3Service implements Resettable, ResourceProvider {"The specified bucket does not exist.", 404)).account();if (inMemory) {- byte[] data = versionId != null+ byte[] data = versionId != null && !"null".equals(versionId)? memoryDataStore.get(physicalVersionedKey(bucketOwnerAccount, bucketName, key, versionId)): memoryDataStore.get(physicalKey(bucketOwnerAccount, bucketName, key));if (data == null) {@@ -1339,7 +1348,7 @@ public class S3Service implements Resettable, ResourceProvider {return new ByteArrayInputStream(data);}try {- Path path = versionId != null+ Path path = versionId != null && !"null".equals(versionId)? resolveVersionedPathForRead(bucketOwnerAccount, bucketName, key, versionId): resolveObjectPathForRead(bucketOwnerAccount, bucketName, key);return Files.newInputStream(path);@@ -1349,7 +1358,7 @@ public class S3Service implements Resettable, ResourceProvider {}public S3Object getObjectMetadata(String bucketName, String key, String versionId) {- return copyObject(getStoredObject(bucketName, key, versionId));+ return copyObject(getStoredObject(bucketName, key, "null".equals(versionId) ? null : versionId));}public GetObjectAttributesResult getObjectAttributes(String bucketName, String key, String versionId,@@ -1489,6 +1498,21 @@ public class S3Service implements Resettable, ResourceProvider {LOG.debugv("Created delete marker: {0}/{1} v={2}", bucketName, key, markerId);fireNotifications(bucketName, key, "ObjectRemoved:DeleteMarkerCreated", deleteMarker);return deleteMarker;+ } else if ("null".equals(versionId)) {+ // A null version is stored at the plain object key until a versioned write replaces it.+ // Treat the literal request value as that null version, not as a versioned key named+ // "null". A delete marker is not the null version and must remain untouched.+ S3Object existing = objectStore.get(objectKey(bucketName, key)).orElse(null);+ if (existing == null || existing.isDeleteMarker() || existing.getVersionId() != null) {+ return null;+ }+ checkLockProtection(existing, bypassGovernance);+ objectStore.delete(objectKey(bucketName, key));+ deleteFile(bucketName, key);+ deleteAllAnnotationsFor(annotationParentKey(bucketName, key, null));+ LOG.debugv("Permanently deleted null version: {0}/{1}", bucketName, key);+ fireNotifications(bucketName, key, "ObjectRemoved:Delete", null);+ return existing;} else if (versionId != null) {// Get the specific version before permanent deletionS3Object toDelete = objectStore.get(versionedKey(bucketName, key, versionId)).orElse(null);diff --git a/src/test/java/io/github/hectorvent/floci/services/s3/S3DeleteObjectsIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/s3/S3DeleteObjectsIntegrationTest.javaindex 0a58d6deee..26d61f3d88 100644--- a/src/test/java/io/github/hectorvent/floci/services/s3/S3DeleteObjectsIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/s3/S3DeleteObjectsIntegrationTest.java@@ -96,6 +96,35 @@ class S3DeleteObjectsIntegrationTest {.statusCode(404);}+ @Test+ void deleteObjects_withNullVersionId_permanentlyDeletesPreVersioningObject() {+ String bucket = createBucket();+ putObject(bucket, "pre-versioned.txt");+ enableVersioning(bucket);++ given()+ .contentType("application/xml")+ .body("<Delete><Object><Key>pre-versioned.txt</Key><VersionId>null</VersionId></Object></Delete>")+ .when()+ .post("/" + bucket + "?delete")+ .then()+ .statusCode(200)+ .body(containsString("<Deleted>"))+ .body(containsString("<Key>pre-versioned.txt</Key>"));++ given()+ .when()+ .get("/" + bucket + "/pre-versioned.txt")+ .then()+ .statusCode(404);++ given()+ .when()+ .delete("/" + bucket)+ .then()+ .statusCode(204);+ }+@Testvoid deleteObjects_governanceRetentionVersionIdHonorsBypassHeader() {String bucket = createBucket();diff --git a/src/test/java/io/github/hectorvent/floci/services/s3/S3VersioningServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/s3/S3VersioningServiceTest.javaindex c61f109b9e..7daecc0b6c 100644--- a/src/test/java/io/github/hectorvent/floci/services/s3/S3VersioningServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/s3/S3VersioningServiceTest.java@@ -70,6 +70,23 @@ class S3VersioningServiceTest {assertNull(obj.getVersionId());}+ @Test+ void deletePreVersioningObjectByNullVersionIdRemovesObjectPermanently() {+ s3Service.putObject("versioned-bucket", "pre-version.txt",+ "data".getBytes(StandardCharsets.UTF_8), "text/plain", null);+ s3Service.putBucketVersioning("versioned-bucket", "Enabled");++ assertEquals("data", new String(s3Service.getObject("versioned-bucket", "pre-version.txt", "null").getData(),+ StandardCharsets.UTF_8));+ assertNotNull(s3Service.headObject("versioned-bucket", "pre-version.txt", "null"));++ s3Service.deleteObject("versioned-bucket", "pre-version.txt", "null");++ assertThrows(AwsException.class,+ () -> s3Service.getObject("versioned-bucket", "pre-version.txt"));+ assertDoesNotThrow(() -> s3Service.deleteBucket("versioned-bucket"));+ }+@Testvoid multipleVersionsOfSameKey() {s3Service.putBucketVersioning("versioned-bucket", "Enabled");@@ -371,4 +388,17 @@ class S3VersioningServiceTest {"batch delete with explicit VersionIds should permanently remove those versions, not place a delete marker");}+ @Test+ void deleteObjectsWithNullVersionIdPermanentlyDeletesPreVersioningObject() {+ s3Service.putObject("versioned-bucket", "key",+ "data".getBytes(StandardCharsets.UTF_8), "text/plain", null);+ s3Service.putBucketVersioning("versioned-bucket", "Enabled");++ s3Service.deleteObjects("versioned-bucket", List.of(+ new XmlParser.KeyVersion("key", "null")));++ assertThrows(AwsException.class, () -> s3Service.getObject("versioned-bucket", "key"));+ assertDoesNotThrow(() -> s3Service.deleteBucket("versioned-bucket"));+ }+}