Merge pull request #453 from arthurkamwt/arthurkamwt/452

Add support for HTTP API cookie parameter

Author: deki

aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsHttpApiV2ProxyHttpServletRequest.java

@@ -37,6 +37,7 @@
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeParseException;
 import java.util.*;
+import java.util.stream.Stream;
 
 public class AwsHttpApiV2ProxyHttpServletRequest extends AwsHttpServletRequest {
     private static Logger log = LoggerFactory.getLogger(AwsHttpApiV2ProxyHttpServletRequest.class);
@@ -75,11 +76,33 @@ public String getAuthType() {
 
     @Override
     public Cookie[] getCookies() {
+        Cookie[] rhc;
         if (headers == null || !headers.containsKey(HttpHeaders.COOKIE)) {
-            return new Cookie[0];
+            rhc = new Cookie[0];
+        } else {
+            rhc = parseCookieHeaderValue(headers.getFirst(HttpHeaders.COOKIE));
         }
 
-        return parseCookieHeaderValue(headers.getFirst(HttpHeaders.COOKIE));
+        Cookie[] rc;
+        if (request.getCookies() == null) {
+            rc = new Cookie[0];
+        } else {
+            rc = request.getCookies().stream()
+                .map(c -> {
+                    int i = c.indexOf('=');
+                    if (i == -1) {
+                        return null;
+                    } else {
+                        String k = SecurityUtils.crlf(c.substring(0, i)).trim();
+                        String v = SecurityUtils.crlf(c.substring(i+1));
+                        return new Cookie(k, v);
+                    }
+                })
+                .filter(c -> c != null)
+                .toArray(Cookie[]::new);
+        }
+
+        return Stream.concat(Arrays.stream(rhc), Arrays.stream(rc)).toArray(Cookie[]::new);
     }
 
     @Override

aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/testutils/AwsProxyRequestBuilder.java

@@ -459,7 +459,11 @@ public HttpApiV2ProxyRequest toHttpApiV2Request() {
         }
         req.setHeaders(new TreeMap<>(String.CASE_INSENSITIVE_ORDER));
         if (request.getMultiValueHeaders() != null) {
-            request.getMultiValueHeaders().forEach((key, value) -> req.getHeaders().put(key, value.get(0)));
+            request.getMultiValueHeaders().forEach((key, value) -> {
+                if (!HttpHeaders.COOKIE.equals(key)) {
+                    req.getHeaders().put(key, value.get(0));
+                }
+            });
         }
         if (request.getRequestContext() != null && request.getRequestContext().getIdentity() != null) {
             if (request.getRequestContext().getIdentity().getCaller() != null) {

aws-serverless-java-container-core/src/test/java/com/amazonaws/serverless/proxy/internal/servlet/AwsHttpApiV2HttpServletRequestReaderTest.java

@@ -25,6 +25,7 @@ public void baseRequest_read_populatesSuccessfully() {
                 .referer("localhost")
                 .queryString("param1", "value1")
                 .header("custom", "value")
+                .cookie("cookey", "cooval")
                 .apiId("test").toHttpApiV2Request();
         AwsHttpApiV2HttpServletRequestReader reader = new AwsHttpApiV2HttpServletRequestReader();
         try {
@@ -33,6 +34,11 @@ public void baseRequest_read_populatesSuccessfully() {
             assertEquals("value1", servletRequest.getParameter("param1"));
             assertEquals("value", servletRequest.getHeader("CUSTOM"));
 
+            assertNotNull(servletRequest.getCookies());
+            assertEquals(1, servletRequest.getCookies().length);
+            assertEquals("cookey", servletRequest.getCookies()[0].getName());
+            assertEquals("cooval", servletRequest.getCookies()[0].getValue());
+
             assertNotNull(servletRequest.getAttribute(AwsHttpApiV2HttpServletRequestReader.HTTP_API_CONTEXT_PROPERTY));
             assertEquals("test",
                     ((HttpApiV2ProxyRequestContext)servletRequest.getAttribute(AwsHttpApiV2HttpServletRequestReader.HTTP_API_CONTEXT_PROPERTY)).getApiId());