Add unit test to verify cookie behavior with Max-Age=0

Author: leekib

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

@@ -17,6 +17,7 @@
 import java.text.SimpleDateFormat;
 import java.time.Instant;
 import java.util.Calendar;
+import java.util.Locale;
 import java.util.TimeZone;
 import java.util.concurrent.CountDownLatch;
 import java.util.regex.Matcher;
@@ -36,7 +37,7 @@ public class AwsHttpServletResponseTest {
     private static final int MAX_AGE_VALUE = 300;
 
     private static final Pattern MAX_AGE_PATTERN = Pattern.compile("Max-Age=(-?[0-9]+)");
-    private static final Pattern EXPIRES_PATTERN = Pattern.compile("Expires=(.*)$");
+    private static final Pattern EXPIRES_PATTERN = Pattern.compile("Expires=([^;]+)");
 
     private static final String CONTENT_TYPE_WITH_CHARSET = "application/json; charset=UTF-8";
     private static final String JAVASCRIPT_CONTENT_TYPE_WITH_CHARSET = "application/javascript; charset=UTF-8";
@@ -144,6 +145,23 @@ void cookie_addCookieWithoutMaxAge_expectNoExpires() {
         assertFalse(cookieHeader.contains("Expires"));
     }
 
+    @Test
+    void cookie_addCookieWithMaxAgeZero_expectExpiresInThePast() {
+        AwsHttpServletResponse resp = new AwsHttpServletResponse(null, null);
+        Cookie zeroMaxAgeCookie = new Cookie(COOKIE_NAME, COOKIE_VALUE);
+        zeroMaxAgeCookie.setMaxAge(0);
+
+        resp.addCookie(zeroMaxAgeCookie);
+        String cookieHeader = resp.getHeader(HttpHeaders.SET_COOKIE);
+
+        Calendar cal = getExpires(cookieHeader);
+        long currentTimeMillis = System.currentTimeMillis();
+
+        assertNotNull(cookieHeader);
+        assertTrue(cal.getTimeInMillis() < currentTimeMillis);
+        assertTrue(cookieHeader.contains(COOKIE_NAME + "=" + COOKIE_VALUE));
+    }
+
     @Test
     void responseHeaders_getAwsResponseHeaders_expectLatestHeader() {
         AwsHttpServletResponse resp = new AwsHttpServletResponse(null, null);
@@ -352,7 +370,7 @@ private Calendar getExpires(String header) {
         assertTrue(ageMatcher.find());
         assertTrue(ageMatcher.groupCount() >= 1);
         String expiresString = ageMatcher.group(1);
-        SimpleDateFormat sdf = new SimpleDateFormat(AwsHttpServletResponse.HEADER_DATE_PATTERN);
+        SimpleDateFormat sdf = new SimpleDateFormat(AwsHttpServletResponse.HEADER_DATE_PATTERN, Locale.US);
         Calendar cal = Calendar.getInstance();
         try {
             cal.setTime(sdf.parse(expiresString));