Let S3Mock accept * and "*" for conditional requests

S3 API accepts * for conditional requests on all APIs.
All APIs but PutObject succeed with "*" as well.

Fixes #2371

Author: afranken

integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/GetPutDeleteObjectIT.kt

@@ -944,7 +944,7 @@ internal class GetPutDeleteObjectIT : S3TestBase() {
   fun testGetObject_successWithMatchingWildcardEtag(testInfo: TestInfo) {
     val (bucketName, putObjectResponse) = givenBucketAndObject(testInfo, UPLOAD_FILE_NAME)
     val eTag = putObjectResponse.eTag()
-    val matchingEtag = "\"*\""
+    val matchingEtag = WILDCARD_ETAG
 
     s3Client.getObject {
       it.bucket(bucketName)
@@ -977,14 +977,13 @@ internal class GetPutDeleteObjectIT : S3TestBase() {
   }
 
   @Test
-  @S3VerifiedFailure(year = 2025,
-    reason = "S3 returns: A header you provided implies functionality that is not implemented.")
+  @S3VerifiedSuccess(year = 2025)
   fun `PUT object fails with non matching wildcard etag`(testInfo: TestInfo) {
     val uploadFile = File(UPLOAD_FILE_NAME)
     val expectedEtag = FileInputStream(uploadFile).let {
       "\"${DigestUtil.hexDigest(it)}\""
     }
-    val nonMatchingEtag = "\"*\""
+    val nonMatchingEtag = WILDCARD_ETAG
 
     val (bucketName, putObjectResponse) = givenBucketAndObject(testInfo, UPLOAD_FILE_NAME)
     putObjectResponse.eTag().also {
@@ -1059,7 +1058,7 @@ internal class GetPutDeleteObjectIT : S3TestBase() {
       "\"${DigestUtil.hexDigest(it)}\""
     }
 
-    val matchingEtag = "\"*\""
+    val matchingEtag = WILDCARD_ETAG
 
     val (bucketName, putObjectResponse) = givenBucketAndObject(testInfo, UPLOAD_FILE_NAME)
     val eTag = putObjectResponse.eTag().also {
@@ -1220,7 +1219,7 @@ internal class GetPutDeleteObjectIT : S3TestBase() {
       "\"${DigestUtil.hexDigest(it)}\""
     }
 
-    val nonMatchingEtag = "\"*\""
+    val nonMatchingEtag = WILDCARD_ETAG
 
     val (bucketName, putObjectResponse) = givenBucketAndObject(testInfo, UPLOAD_FILE_NAME)
     putObjectResponse.eTag().also {

integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/S3TestBase.kt

@@ -39,6 +39,7 @@ import software.amazon.awssdk.services.s3.S3Client
 import software.amazon.awssdk.services.s3.S3Configuration
 import software.amazon.awssdk.services.s3.internal.crt.S3CrtAsyncClient
 import software.amazon.awssdk.services.s3.model.Bucket
+import software.amazon.awssdk.services.s3.model.BucketType
 import software.amazon.awssdk.services.s3.model.ChecksumAlgorithm
 import software.amazon.awssdk.services.s3.model.DeleteObjectResponse
 import software.amazon.awssdk.services.s3.model.EncodingType
@@ -271,6 +272,21 @@ internal abstract class S3TestBase {
     return bucketName
   }
 
+  fun givenDirectoryBucket(bucketName: String = randomName): String {
+    _s3Client.createBucket {
+      it.bucket(bucketName)
+      it.createBucketConfiguration {
+        it.bucket {
+          it.type(BucketType.DIRECTORY)
+        }
+      }
+    }
+    val bucketCreated = _s3Client.waiter().waitUntilBucketExists { it.bucket(bucketName) }
+    val bucketCreatedResponse = bucketCreated.matched().response().get()
+    assertThat(bucketCreatedResponse).isNotNull
+    return bucketName
+  }
+
   fun givenObject(bucketName: String, key: String, fileName: String? = null): PutObjectResponse {
     val uploadFile = File(fileName ?: key)
     return _s3Client.putObject({
@@ -575,6 +591,7 @@ internal abstract class S3TestBase {
   }
 
   companion object {
+    const val WILDCARD_ETAG = "*"
     val INITIAL_BUCKET_NAMES: Collection<String> = listOf("bucket-a", "bucket-b")
     val LOG: Logger = LoggerFactory.getLogger(this::class.java)
     const val TEST_ENC_KEY_ID = "valid-test-key-id"

server/src/main/java/com/adobe/testing/s3mock/service/ObjectService.java

@@ -28,7 +28,6 @@
 
 import com.adobe.testing.s3mock.S3Exception;
 import com.adobe.testing.s3mock.dto.AccessControlPolicy;
-import com.adobe.testing.s3mock.dto.Checksum;
 import com.adobe.testing.s3mock.dto.ChecksumAlgorithm;
 import com.adobe.testing.s3mock.dto.ChecksumType;
 import com.adobe.testing.s3mock.dto.Delete;
@@ -49,7 +48,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.Instant;
-import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -58,6 +56,7 @@
 
 public class ObjectService extends ServiceBase {
   static final String WILDCARD_ETAG = "\"*\"";
+  static final String WILDCARD = "*";
   private static final Logger LOG = LoggerFactory.getLogger(ObjectService.class);
   private final BucketStore bucketStore;
   private final ObjectStore objectStore;
@@ -369,7 +368,7 @@ public void verifyObjectMatching(
 
     var setMatch = match != null && !match.isEmpty();
     if (setMatch) {
-      if (match.contains(WILDCARD_ETAG)) {
+      if (match.contains(WILDCARD_ETAG) || match.contains(WILDCARD)) {
         //request cares only that the object exists
         return;
       } else if (!match.contains(etag)) {
@@ -378,7 +377,9 @@ public void verifyObjectMatching(
     }
 
     var setNoneMatch = noneMatch != null && !noneMatch.isEmpty();
-    if (setNoneMatch && (noneMatch.contains(WILDCARD_ETAG) || noneMatch.contains(etag))) {
+    if (setNoneMatch
+        && (noneMatch.contains(WILDCARD_ETAG) || noneMatch.contains(WILDCARD) || noneMatch.contains(etag))
+    ) {
       //request cares only that the object DOES NOT exist.
       throw NOT_MODIFIED;
     }