Merge pull request #32110 from c-classen/main

Prevent splitting of cookie header values when using AWS Lambda
quarkusio · Mar 28, 2023 · b39b85b · b39b85b
2 parents 0f6cf71 + 736ba35
commit b39b85b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/...http-event-server/src/main/java/io/quarkus/amazon/lambda/runtime/MockHttpEventServer.java b/...http-event-server/src/main/java/io/quarkus/amazon/lambda/runtime/MockHttpEventServer.java
@@ -128,6 +128,11 @@ public void processResponse(RoutingContext ctx, RoutingContext pending, Buffer b
                         }
                     }
                 }
+                if (res.getCookies() != null) {
+                    for (String cookie : res.getCookies()) {
+                        response.headers().add("set-cookie", cookie);
+                    }
+                }
                 response.setStatusCode(res.getStatusCode());
                 String body = res.getBody();
                 if (body != null) {

diff --git a/...on-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpHandler.java b/...on-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpHandler.java
@@ -108,6 +108,11 @@ public void handleMessage(Object msg) {
                         if (allForName == null || allForName.isEmpty()) {
                             continue;
                         }
+                        // Handle cookies separately to preserve commas in the header values
+                        if ("set-cookie".equals(name)) {
+                            responseBuilder.setCookies(allForName);
+                            continue;
+                        }
                         final StringBuilder sb = new StringBuilder();
                         for (Iterator<String> valueIterator = allForName.iterator(); valueIterator.hasNext();) {
                             sb.append(valueIterator.next());