Accept unquoted etags in if-match/if-none-match headers

Fixes #2665

Author: afranken

CHANGELOG.md

@@ -172,7 +172,8 @@ Version 4.x is JDK17 LTS bytecode compatible, with Docker and JUnit / direct Jav
 Version 4.x is JDK17 LTS bytecode compatible, with Docker and JUnit / direct Java integration.
 
 * Features and fixes
-  * TBD
+  * Return correct error body on invalid ranges (fixes #2732)
+  * Accept unquoted etags in if-match/if-none-match headers (fixes #2665)
 * Refactorings
   * TBD
 * Version updates (deliverable dependencies)
@@ -183,6 +184,7 @@ Version 4.x is JDK17 LTS bytecode compatible, with Docker and JUnit / direct Jav
   * Bump org.apache.commons:commons-lang3 from 3.18.0 to 3.19.0
 * Version updates (build dependencies)
   * Bump kotlin.version from 2.2.20 to 2.2.21
+  * Bump aws.sdk.kotlin:s3-jvm from 1.5.41 to 1.5.73
   * Bump digital.pragmatech.testing:spring-test-profiler from 0.0.12 to 0.0.13
   * Bump org.mockito.kotlin:mockito-kotlin from 6.0.0 to 6.1.0
   * Bump org.xmlunit:xmlunit-assertj3 from 2.10.4 to 2.11.0

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

@@ -1337,17 +1337,16 @@ internal class GetPutDeleteObjectIT : S3TestBase() {
   }
 
   @Test
-  @S3VerifiedSuccess(year = 2025)
+  @S3VerifiedTodo
   fun `GET object succeeds with unquoted if-match=true`(testInfo: TestInfo) {
     val (bucketName, putObjectResponse) = givenBucketAndObject(testInfo, UPLOAD_FILE_NAME)
     val matchingEtag = putObjectResponse.eTag()
-    // TODO: should work with both quoted and unquoted etags
     val unquotedEtag = matchingEtag.substring(1, matchingEtag.length - 1)
     s3Client
       .getObject {
         it.bucket(bucketName)
         it.key(UPLOAD_FILE_NAME)
-        it.ifMatch(matchingEtag)
+        it.ifMatch(unquotedEtag)
       }.use {
         assertThat(it.response().eTag()).isEqualTo(matchingEtag)
         assertThat(it.response().contentLength()).isEqualTo(UPLOAD_FILE_LENGTH)
@@ -1426,18 +1425,17 @@ internal class GetPutDeleteObjectIT : S3TestBase() {
   }
 
   @Test
-  @S3VerifiedSuccess(year = 2025)
+  @S3VerifiedTodo
   fun `GET object fails with unquoted if-none-match=false`(testInfo: TestInfo) {
     val (bucketName, putObjectResponse) = givenBucketAndObject(testInfo, UPLOAD_FILE_NAME)
     val matchingEtag = putObjectResponse.eTag()
-    // TODO: should work with both quoted and unquoted etags
     val unquotedEtag = matchingEtag.substring(1, matchingEtag.length - 1)
 
     assertThatThrownBy {
       s3Client.getObject {
         it.bucket(bucketName)
         it.key(UPLOAD_FILE_NAME)
-        it.ifNoneMatch(matchingEtag)
+        it.ifNoneMatch(unquotedEtag)
       }
     }.isInstanceOf(S3Exception::class.java)
       .hasMessageContaining("Service: S3, Status Code: 304")

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

@@ -368,11 +368,16 @@ public void verifyObjectMatching(
 
     var setMatch = match != null && !match.isEmpty();
     if (setMatch) {
-      if (match.contains(WILDCARD_ETAG) || match.contains(WILDCARD) || match.contains(etag)) {
+      var unquotedEtag = etag.replace("\"", "");
+      if (match.contains(WILDCARD_ETAG)
+          || match.contains(WILDCARD)
+          || match.contains(etag)
+          || match.contains(unquotedEtag)
+      ) {
         // request cares only that the object exists or that the etag matches.
         LOG.debug("Object {} exists", s3ObjectMetadata.key());
         return;
-      } else if (!match.contains(etag)) {
+      } else if (!match.contains(unquotedEtag) && !match.contains(etag)) {
         LOG.debug("Object {} does not match etag {}", s3ObjectMetadata.key(), etag);
         throw PRECONDITION_FAILED;
       }
@@ -388,7 +393,12 @@ public void verifyObjectMatching(
 
     var setNoneMatch = noneMatch != null && !noneMatch.isEmpty();
     if (setNoneMatch) {
-      if (noneMatch.contains(WILDCARD_ETAG) || noneMatch.contains(WILDCARD) || noneMatch.contains(etag)) {
+      var unquotedEtag = etag.replace("\"", "");
+      if (noneMatch.contains(WILDCARD_ETAG)
+          || noneMatch.contains(WILDCARD)
+          || noneMatch.contains(etag)
+          || noneMatch.contains(unquotedEtag)
+      ) {
         // request cares only that the object etag does not match.
         LOG.debug("Object {} has an ETag {} that matches one of the 'noneMatch' values", s3ObjectMetadata.key(), etag);
         throw NOT_MODIFIED;