add SameSite as a cookie attribute option

Kong · Feb 6, 2020 · c03b8a2 · c03b8a2
1 parent df7421c
commit c03b8a2
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 6 deletions.
diff --git a/unirest/src/main/java/kong/unirest/Cookie.java b/unirest/src/main/java/kong/unirest/Cookie.java
@@ -30,9 +30,7 @@
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -51,6 +49,7 @@ public class Cookie {
     private Integer maxAge;
     private ZonedDateTime expires;
     private boolean secure;
+    private SameSite sameSite;
 
     public Cookie(String name, String value){
         this.name = name;
@@ -125,6 +124,9 @@ private void parseSection(String[] sub) {
                 secure = true;
                 break;
             }
+            case "samesite": {
+                sameSite = SameSite.parse(sub[1]);
+            }
         }
     }
 
@@ -181,7 +183,6 @@ public void setHttpOnly(boolean httpOnly) {
         this.httpOnly = httpOnly;
     }
 
-
     private static class Pair {
         final String key;
         final String value;
@@ -243,7 +244,7 @@ public boolean isHttpOnly() {
      * Per Wikipedia:
      * The Secure attribute is meant to keep cookie communication limited to encrypted transmission,
      * directing browsers to use cookies only via secure/encrypted connections.
-     * @return
+     * @return a boolean of if the cookie is secure
      */
     public boolean isSecure() {
         return secure;
@@ -253,7 +254,7 @@ public boolean isSecure() {
      * Per Wikipedia:
      * the Max-Age attribute can be used to set the cookie's expiration as an interval of seconds in the future,
      * relative to the time the browser received the cookie.
-     * @return
+     * @return Max-Age attribute
      */
     public int getMaxAge() {
         return maxAge;
@@ -268,5 +269,24 @@ public ZonedDateTime getExpiration() {
         return expires;
     }
 
+    /**
+     * returns the SameSite attribute
+     * @return the SameSite attribute if set. or null
+     */
+    public SameSite getSameSite() {
+        return sameSite;
+    }
 
+    public enum SameSite {
+        None, Strict, Lax;
+
+        private static EnumSet<SameSite> all = EnumSet.allOf(SameSite.class);
+
+        public static SameSite parse(String value) {
+            return all.stream()
+                    .filter(e -> e.name().equalsIgnoreCase(value))
+                    .findFirst()
+                    .orElse(null);
+        }
+    }
 }
diff --git a/unirest/src/test/java/kong/unirest/CookieParsingTest.java b/unirest/src/test/java/kong/unirest/CookieParsingTest.java
@@ -46,6 +46,7 @@ public void parseFull() {
         assertTrue(c.isHttpOnly());
         assertFalse(c.isSecure());
         assertEquals(42, c.getMaxAge());
+        assertNull(c.getSameSite());
     }
 
     @Test
@@ -62,6 +63,13 @@ public void parseBackOutToString() {
         assertEquals(v, c.toString());
     }
 
+    @Test
+    public void sameSite() {
+        String v = "color=blue;SameSite=Strict";
+        Cookie c = new Cookie(v);
+        assertEquals(Cookie.SameSite.Strict, c.getSameSite());
+    }
+
     @Test
     public void emptyValue() {
         String v = "SignOnDefault=; domain=.admin.virginia.edu; path=/; HttpOnly";