Merge pull request quarkusio#50137 from juliusz-cwiakalski/fix/50075/aws-lambda-http-multiple-cookies

Correctly handle multiple Set-Cookie headers for API Gateway v2

Author: geoand

extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpHandler.java

@@ -109,7 +109,7 @@ public void handleMessage(Object msg) {
                             continue;
                         }
                         // Handle cookies separately to preserve commas in the header values
-                        if ("set-cookie".equals(name)) {
+                        if ("set-cookie".equalsIgnoreCase(name)) {
                             responseBuilder.setCookies(allForName);
                             continue;
                         }

integration-tests/amazon-lambda-http/src/main/java/io/quarkus/it/amazon/lambda/CookiesResource.java

@@ -0,0 +1,40 @@
+package io.quarkus.it.amazon.lambda;
+
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.NewCookie;
+import jakarta.ws.rs.core.Response;
+
+@Path("/cookies")
+@Produces(MediaType.APPLICATION_JSON)
+public class CookiesResource {
+
+    @GET
+    @Path("/one/{name}")
+    public Response one(@PathParam("name") String name) {
+        NewCookie cookie = buildCookie("cookie1", name);
+        return Response.ok("{\"status\":\"ok\"}").cookie(cookie).build();
+    }
+
+    @GET
+    @Path("/two/{name1}/{name2}")
+    public Response two(@PathParam("name1") String name1, @PathParam("name2") String name2) {
+        NewCookie cookie1 = buildCookie("cookie1", name1);
+        NewCookie cookie2 = buildCookie("cookie2", name2);
+        return Response.ok("{\"status\":\"ok\"}").cookie(cookie1, cookie2).build();
+    }
+
+    private static NewCookie buildCookie(String name, String value) {
+        return new NewCookie.Builder(name)
+                .value(value)
+                .path("/")
+                .maxAge(3600)
+                .secure(true)
+                .httpOnly(true)
+                .sameSite(NewCookie.SameSite.LAX)
+                .build();
+    }
+}

integration-tests/amazon-lambda-http/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java

@@ -3,9 +3,11 @@
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.Matchers.hasItems;
 
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
 
 import jakarta.ws.rs.core.MediaType;
 
@@ -328,4 +330,51 @@ public void testProxyRequestContext() throws Exception {
                 .then()
                 .statusCode(204);
     }
+
+    @Test
+    public void testSingleCookieByEvent() {
+        APIGatewayV2HTTPEvent request = request("/cookies/one/value1");
+        given()
+                .contentType("application/json")
+                .accept("application/json")
+                .body(request)
+                .when()
+                .post(AmazonLambdaApi.API_BASE_PATH_TEST)
+                .then()
+                .statusCode(200)
+                .body("cookies.size()", equalTo(1))
+                .body("cookies[0]", containsString("cookie1=value1"))
+                .body("headers.'Set-Cookie'", equalTo(null));
+    }
+
+    @Test
+    public void testMultipleCookiesByEvent() {
+        APIGatewayV2HTTPEvent request = request("/cookies/two/value1/value2");
+        given()
+                .contentType("application/json")
+                .accept("application/json")
+                .body(request)
+                .when()
+                .post(AmazonLambdaApi.API_BASE_PATH_TEST)
+                .then()
+                .statusCode(200)
+                .body("cookies.size()", equalTo(2))
+                .body("cookies", hasItems(containsString("cookie1=value1"), containsString("cookie2=value2")))
+                .body("headers.'Set-Cookie'", equalTo(null));
+    }
+
+    @Test
+    public void testMultipleCookiesDirectHttp() {
+        List<String> cookies = given()
+                .when()
+                .get("/cookies/two/value1/value2")
+                .then()
+                .statusCode(200)
+                .extract()
+                .headers()
+                .getValues("Set-Cookie");
+        Assertions.assertEquals(2, cookies.size());
+        Assertions.assertTrue(cookies.stream().anyMatch(s -> s.contains("cookie1=value1")));
+        Assertions.assertTrue(cookies.stream().anyMatch(s -> s.contains("cookie2=value2")));
+    }
 }