Merge pull request quarkusio#38466 from stianst/samesite

Use proper case for SameSite cookie
cescoffier · Jan 30, 2024 · 527cd0f · 527cd0f
2 parents 8d799c4 + a280efc
commit 527cd0f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/...ime/src/main/java/org/jboss/resteasy/reactive/common/headers/NewCookieHeaderDelegate.java b/...ime/src/main/java/org/jboss/resteasy/reactive/common/headers/NewCookieHeaderDelegate.java
@@ -140,8 +140,21 @@ public String toString(Object value) {
             b.append(";HttpOnly");
         if (cookie.getSameSite() != null) {
             b.append(";SameSite=");
-            b.append(cookie.getSameSite());
+            appendCorrectCase(b, cookie.getSameSite());
         }
         return b.toString();
     }
+
+    private static void appendCorrectCase(final StringBuilder sb, final Enum<?> e) {
+        boolean first = true;
+        for (char c : e.name().toCharArray()) {
+            if (first) {
+                sb.append(c);
+                first = false;
+            } else {
+                sb.append(Character.toLowerCase(c));
+            }
+        }
+    }
+
 }
diff --git a/...ertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/headers/CookiesTest.java b/...ertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/headers/CookiesTest.java
@@ -108,7 +108,7 @@ void testSameSite() {
                 .formParam("cookie", "greeting=\"hello\";SameSite=\"Lax\";")
                 .post("/cookies/set-cookie")
                 .then()
-                .cookie("greeting", detailedCookie().value("hello").sameSite("LAX"));
+                .cookie("greeting", detailedCookie().value("hello").sameSite("Lax"));
     }
 
     @Test
@@ -119,7 +119,7 @@ void testSameSiteWithoutColon() {
                 .formParam("cookie", "greeting=\"hello\";SameSite=\"None\"")
                 .post("/cookies/set-cookie")
                 .then()
-                .cookie("greeting", detailedCookie().value("hello").sameSite("NONE"));
+                .cookie("greeting", detailedCookie().value("hello").sameSite("None"));
     }
 
     @Test
@@ -130,7 +130,7 @@ void testSameSiteLowercase() {
                 .formParam("cookie", "greeting=\"hello\";samesite=\"Strict\"")
                 .post("/cookies/set-cookie")
                 .then()
-                .cookie("greeting", detailedCookie().value("hello").sameSite("STRICT"));
+                .cookie("greeting", detailedCookie().value("hello").sameSite("Strict"));
     }
 
     @Test