Adding httpOnly cookie flag to Java binding

Author: barancev

.idea/ant.xml

@@ -26,9 +26,10 @@ public class Cookie {
   private final String domain;
   private final Date expiry;
   private final boolean isSecure;
+  private final boolean isHttpOnly;
 
   /**
-   * Creates an insecure cookie with no domain specified.
+   * Creates an insecure non-httpOnly cookie with no domain specified.
    * 
    * @param name The name of the cookie; may not be null or an empty string.
    * @param value The cookie value; may not be null.
@@ -42,7 +43,7 @@ public Cookie(String name, String value, String path, Date expiry) {
   }
 
   /**
-   * Creates an insecure cookie.
+   * Creates an insecure non-httpOnly cookie.
    * 
    * @param name The name of the cookie; may not be null or an empty string.
    * @param value The cookie value; may not be null.
@@ -57,7 +58,7 @@ public Cookie(String name, String value, String domain, String path, Date expiry
   }
 
   /**
-   * Creates a cookie.
+   * Creates a non-httpOnly cookie.
    * 
    * @param name The name of the cookie; may not be null or an empty string.
    * @param value The cookie value; may not be null.
@@ -68,13 +69,31 @@ public Cookie(String name, String value, String domain, String path, Date expiry
    * @param isSecure Whether this cookie requires a secure connection.
    */
   public Cookie(String name, String value, String domain, String path, Date expiry,
-      boolean isSecure) {
+                boolean isSecure) {
+    this(name, value, domain, path, expiry, isSecure, false);
+  }
+
+  /**
+   * Creates a cookie.
+   *
+   * @param name The name of the cookie; may not be null or an empty string.
+   * @param value The cookie value; may not be null.
+   * @param domain The domain the cookie is visible to.
+   * @param path The path the cookie is visible to. If left blank or set to null, will be set to
+   *        "/".
+   * @param expiry The cookie's expiration date; may be null.
+   * @param isSecure Whether this cookie requires a secure connection.
+   * @param isHttpOnly Whether this cookie is a httpOnly cooke.
+   */
+  public Cookie(String name, String value, String domain, String path, Date expiry,
+      boolean isSecure, boolean isHttpOnly) {
     this.name = name;
     this.value = value;
     this.path = path == null || "".equals(path) ? "/" : path;
 
     this.domain = stripPort(domain);
     this.isSecure = isSecure;
+    this.isHttpOnly = isHttpOnly;
 
     if (expiry != null) {
       // Expiration date is specified in seconds since (UTC) epoch time, so truncate the date.
@@ -125,6 +144,10 @@ public boolean isSecure() {
     return isSecure;
   }
 
+  public boolean isHttpOnly() {
+    return isHttpOnly;
+  }
+
   public Date getExpiry() {
     return expiry;
   }
@@ -193,6 +216,7 @@ public static class Builder {
     private String domain;
     private Date expiry;
     private boolean secure;
+    private boolean httpOnly;
 
     public Builder(String name, String value) {
       this.name = name;
@@ -219,8 +243,13 @@ public Builder isSecure(boolean secure) {
       return this;
     }
 
+    public Builder isHttpOnly(boolean httpOnly) {
+      this.httpOnly = httpOnly;
+      return this;
+    }
+
     public Cookie build() {
-      return new Cookie(name, value, domain, path, expiry, secure);
+      return new Cookie(name, value, domain, path, expiry, secure, httpOnly);
     }
   }
 }

java/client/src/org/openqa/selenium/Cookie.java

@@ -64,4 +64,16 @@ public void testSecureDefaultsToFalse() {
     Cookie cookie = new Cookie("name", "value");
     assertFalse(cookie.isSecure());
   }
+
+  @Test
+  public void testCookiesShouldAllowHttpOnlyToBeSet() {
+    Cookie cookie = new Cookie("name", "value", "", "/", new Date(), false, true);
+    assertTrue(cookie.isHttpOnly());
+  }
+
+  @Test
+  public void testHttpOnlyDefaultsToFalse() {
+    Cookie cookie = new Cookie("name", "value");
+    assertFalse(cookie.isHttpOnly());
+  }
 }