Thread: [HtmlUnit] SVN: [9217] trunk/htmlunit/src (Page 18)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 9217
          http://sourceforge.net/p/htmlunit/code/9217
Author:   rbri
Date:     2014-03-30 13:52:14 +0000 (Sun, 30 Mar 2014)
Log Message:
-----------
Cookies: Different path interpretation done by IE11 fixed.

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/CookieManager.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HttpWebConnection.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocument.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/CookieManager2Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/CookieManagerTest.java

Added Paths:
-----------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HtmlUnitBrowserCompatCookieSpec.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
===================================================================

--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2014-03-30 12:18:39 UTC (rev 9216)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2014-03-30 13:52:14 UTC (rev 9217)
@@ -649,6 +649,12 @@
     @BrowserFeature({ @WebBrowser(FF), @WebBrowser(CHROME) })
     HTTP_HEADER_HOST_FIRST,
 
+    /** Indicates that the pas is extracted from the location (IE11).
+     * Sample: from the location /foo/boo only /foo is used.
+     */
+    @BrowserFeature(@WebBrowser(value = IE, minVersion = 11))
+    HTTP_COOKIE_EXTRACT_PATH_FROM_LOCATION,
+
     /** Indicates that the browser should ignore contents of inner head elements. */
     @BrowserFeature(@WebBrowser(value = IE, maxVersion = 9))
     IGNORE_CONTENTS_OF_INNER_HEAD,

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/CookieManager.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/CookieManager.java	2014-03-30 12:18:39 UTC (rev 9216)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/CookieManager.java	2014-03-30 13:52:14 UTC (rev 9217)
@@ -19,13 +19,11 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.collections.set.ListOrderedSet;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.cookie.CookieOrigin;
 import org.apache.http.cookie.CookieSpec;
@@ -51,8 +49,7 @@
     private boolean cookiesEnabled_;
 
     /** The cookies added to this cookie manager. */
-    @SuppressWarnings("unchecked")
-    private final Set<Cookie> cookies_ = new ListOrderedSet();
+    private final Set<Cookie> cookies_ = new LinkedHashSet<Cookie>();
 
     private final transient CookieSpec cookieSpec_ = new BrowserCompatSpecFactory().create(null);
 
@@ -89,7 +86,8 @@
             return Collections.<Cookie>emptySet();
         }
 
-        final Set<Cookie> copy = new HashSet<Cookie>(cookies_);
+        final Set<Cookie> copy = new LinkedHashSet<Cookie>();
+        copy.addAll(cookies_);
         return Collections.unmodifiableSet(copy);
     }
 
@@ -98,7 +96,10 @@
      * If disabled, this returns an empty set.
      * @param url the URL on which to filter the returned cookies
      * @return the currently configured cookies applicable to the specified URL, in an unmodifiable set
+     *
+     * @deprecated as of 2.13 use {@link WebClient#getCookies(URL)}
      */
+    @Deprecated
     public synchronized Set<Cookie> getCookies(final URL url) {
         if (!isCookiesEnabled()) {
             return Collections.<Cookie>emptySet();
@@ -236,5 +237,4 @@
 
         cookies_.clear();
     }
-
 }

Added: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HtmlUnitBrowserCompatCookieSpec.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HtmlUnitBrowserCompatCookieSpec.java	                        (rev 0)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HtmlUnitBrowserCompatCookieSpec.java	2014-03-30 13:52:14 UTC (rev 9217)
@@ -0,0 +1,197 @@
+/*
+ * Copyright (c) 2002-2014 Gargoyle Software Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gargoylesoftware.htmlunit;
+
+import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.HTTP_COOKIE_EXTENDED_DATE_PATTERNS;
+import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.HTTP_COOKIE_START_DATE_1970;
+import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.HTTP_COOKIE_EXTRACT_PATH_FROM_LOCATION;
+
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+
+import org.apache.http.Header;
+import org.apache.http.client.utils.DateUtils;
+import org.apache.http.cookie.ClientCookie;
+import org.apache.http.cookie.Cookie;
+import org.apache.http.cookie.CookieAttributeHandler;
+import org.apache.http.cookie.CookieOrigin;
+import org.apache.http.cookie.CookiePathComparator;
+import org.apache.http.cookie.MalformedCookieException;
+import org.apache.http.cookie.SetCookie;
+import org.apache.http.impl.cookie.BasicClientCookie;
+import org.apache.http.impl.cookie.BasicPathHandler;
+import org.apache.http.impl.cookie.BrowserCompatSpec;
+
+/**
+ * Customized BrowserCompatSpec for HtmlUnit.
+ *
+ * Workaround for <a href="https://issues.apache.org/jira/browse/HTTPCLIENT-1006">HttpClient bug 1006</a>:
+ * quotes are wrongly removed in cookie's values.
+ *
+ * @version $Revision$
+ * @author <a href="mailto:mb...@Ga...">Mike Bowler</a>
+ * @author Noboru Sinohara
+ * @author David D. Kilzer
+ * @author Marc Guillemot
+ * @author Brad Clarke
+ * @author Ahmed Ashour
+ * @author Nicolas Belisle
+ * @author Ronald Brill
+ * @author John J Murdoch
+ */
+public class HtmlUnitBrowserCompatCookieSpec extends BrowserCompatSpec {
+    /**
+     * Comparator for sending cookies in right order.
+     * See specification:
+     * - RFC2109 (#4.3.4) http://www.ietf.org/rfc/rfc2109.txt
+     * - RFC2965 (#3.3.4) http://www.ietf.org/rfc/rfc2965.txt http://www.ietf.org/rfc/rfc2109.txt
+     */
+    private static final Comparator<Cookie> COOKIE_COMPARATOR = new CookiePathComparator();
+
+    private static final Date DATE_1_1_1970;
+
+    static {
+        final Calendar calendar = Calendar.getInstance();
+        calendar.setTimeZone(DateUtils.GMT);
+        calendar.set(1970, Calendar.JANUARY, 1, 0, 0, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        DATE_1_1_1970 = calendar.getTime();
+    }
+
+    // simplified patterns from BrowserCompatSpec, with yy patterns before similar yyyy patterns
+    private static final String[] DEFAULT_DATE_PATTERNS = new String[] {
+        "EEE dd MMM yy HH mm ss zzz",
+        "EEE dd MMM yyyy HH mm ss zzz",
+        "EEE MMM d HH mm ss yyyy",
+        "EEE dd MMM yy HH mm ss z ",
+        "EEE dd MMM yyyy HH mm ss z ",
+        "EEE dd MM yy HH mm ss z ",
+        "EEE dd MM yyyy HH mm ss z ",
+    };
+    private static final String[] EXTENDED_DATE_PATTERNS = new String[] {
+        "EEE dd MMM yy HH mm ss zzz",
+        "EEE dd MMM yyyy HH mm ss zzz",
+        "EEE MMM d HH mm ss yyyy",
+        "EEE dd MMM yy HH mm ss z ",
+        "EEE dd MMM yyyy HH mm ss z ",
+        "EEE dd MM yy HH mm ss z ",
+        "EEE dd MM yyyy HH mm ss z ",
+        "d/M/yyyy",
+    };
+
+    /**
+     * Constructor.
+     *
+     * @param browserVersion the {@link BrowserVersion} to simulate
+     */
+    public HtmlUnitBrowserCompatCookieSpec(final BrowserVersion browserVersion) {
+        super();
+        final BasicPathHandler pathHandler = new BasicPathHandler() {
+            @Override
+            public void validate(final Cookie cookie, final CookieOrigin origin) throws MalformedCookieException {
+                // nothing, browsers seem not to perform any validation
+            }
+
+            @Override
+            public boolean match(final Cookie cookie, final CookieOrigin origin) {
+                String targetpath = origin.getPath();
+                if (browserVersion.hasFeature(HTTP_COOKIE_EXTRACT_PATH_FROM_LOCATION) && targetpath.length() > 0) {
+                    final int lastSlashPos = targetpath.lastIndexOf('/');
+                    if (lastSlashPos > 1 && lastSlashPos < targetpath.length()) {
+                        targetpath = targetpath.substring(0, lastSlashPos);
+                    }
+                }
+
+                final CookieOrigin newOrigin = new CookieOrigin(origin.getHost(),
+                            origin.getPort(), targetpath, origin.isSecure());
+
+                return super.match(cookie, newOrigin);
+            }
+        };
+        registerAttribHandler(ClientCookie.PATH_ATTR, pathHandler);
+
+        final CookieAttributeHandler originalExpiresHandler = getAttribHandler(ClientCookie.EXPIRES_ATTR);
+        final CookieAttributeHandler wrapperExpiresHandler = new CookieAttributeHandler() {
+
+            public void validate(final Cookie cookie, final CookieOrigin origin) throws MalformedCookieException {
+                originalExpiresHandler.validate(cookie, origin);
+            }
+
+            public void parse(final SetCookie cookie, String value) throws MalformedCookieException {
+                if (value.startsWith("\"") && value.endsWith("\"")) {
+                    value = value.substring(1, value.length() - 1);
+                }
+                value = value.replaceAll("[ ,:-]+", " ");
+
+                Date startDate = null;
+                if (browserVersion.hasFeature(HTTP_COOKIE_START_DATE_1970)) {
+                    startDate = DATE_1_1_1970;
+                }
+
+                String[] datePatterns = DEFAULT_DATE_PATTERNS;
+                if (browserVersion.hasFeature(HTTP_COOKIE_EXTENDED_DATE_PATTERNS)) {
+                    datePatterns = EXTENDED_DATE_PATTERNS;
+                }
+
+                cookie.setExpiryDate(DateUtils.parseDate(value, datePatterns, startDate));
+            }
+
+            public boolean match(final Cookie cookie, final CookieOrigin origin) {
+                return originalExpiresHandler.match(cookie, origin);
+            }
+        };
+        registerAttribHandler(ClientCookie.EXPIRES_ATTR, wrapperExpiresHandler);
+
+        final CookieAttributeHandler httpOnlyHandler = new CookieAttributeHandler() {
+            public void validate(final Cookie cookie, final CookieOrigin origin) throws MalformedCookieException {
+                // nothing
+            }
+
+            public void parse(final SetCookie cookie, final String value) throws MalformedCookieException {
+                ((BasicClientCookie) cookie).setAttribute("httponly", "true");
+            }
+
+            public boolean match(final Cookie cookie, final CookieOrigin origin) {
+                return true;
+            }
+        };
+        registerAttribHandler("httponly", httpOnlyHandler);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public List<Cookie> parse(final Header header, final CookieOrigin origin) throws MalformedCookieException {
+        final List<Cookie> cookies = super.parse(header, origin);
+        for (final Cookie c : cookies) {
+            // re-add quotes around value if parsing as incorrectly trimmed them
+            if (header.getValue().contains(c.getName() + "=\"" + c.getValue())) {
+                ((BasicClientCookie) c).setValue('"' + c.getValue() + '"');
+            }
+        }
+        return cookies;
+    }
+
+    @Override
+    public List<Header> formatCookies(final List<Cookie> cookies) {
+        Collections.sort(cookies, COOKIE_COMPARATOR);
+
+        return super.formatCookies(cookies);
+    }
+}


Property changes on: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HtmlUnitBrowserCompatCookieSpec.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HttpWebConnection.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HttpWebConnection.java	2014-03-30 12:18:39 UTC (rev 9216)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HttpWebConnection.java	2014-03-30 13:52:14 UTC (rev 9217)
@@ -15,8 +15,6 @@
 package com.gargoylesoftware.htmlunit;
 
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.HEADER_CONTENT_DISPOSITION_ABSOLUTE_PATH;
-import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.HTTP_COOKIE_EXTENDED_DATE_PATTERNS;
-import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.HTTP_COOKIE_START_DATE_1970;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.HTTP_HEADER_HOST_FIRST;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.URL_AUTH_CREDENTIALS;
 
@@ -34,9 +32,7 @@
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Calendar;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -70,7 +66,6 @@
 import org.apache.http.client.methods.HttpTrace;
 import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.client.utils.DateUtils;
 import org.apache.http.client.utils.URIUtils;
 import org.apache.http.client.utils.URLEncodedUtils;
 import org.apache.http.config.ConnectionConfig;
@@ -81,15 +76,9 @@
 import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
 import org.apache.http.conn.ssl.SSLContexts;
 import org.apache.http.conn.ssl.X509HostnameVerifier;
-import org.apache.http.cookie.ClientCookie;
 import org.apache.http.cookie.Cookie;
-import org.apache.http.cookie.CookieAttributeHandler;
-import org.apache.http.cookie.CookieOrigin;
-import org.apache.http.cookie.CookiePathComparator;
 import org.apache.http.cookie.CookieSpec;
 import org.apache.http.cookie.CookieSpecProvider;
-import org.apache.http.cookie.MalformedCookieException;
-import org.apache.http.cookie.SetCookie;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.entity.mime.MultipartEntityBuilder;
@@ -97,10 +86,7 @@
 import org.apache.http.impl.client.DefaultRedirectStrategy;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
-import org.apache.http.impl.cookie.BasicClientCookie;
-import org.apache.http.impl.cookie.BasicPathHandler;
 import org.apache.http.impl.cookie.BestMatchSpecFactory;
-import org.apache.http.impl.cookie.BrowserCompatSpec;
 import org.apache.http.impl.cookie.BrowserCompatSpecFactory;
 import org.apache.http.impl.cookie.IgnoreSpecFactory;
 import org.apache.http.impl.cookie.NetscapeDraftSpecFactory;
@@ -150,8 +136,7 @@
         htmlUnitCookieSpecProvider_ = new CookieSpecProvider() {
             @Override
             public CookieSpec create(final HttpContext context) {
-                return new HtmlUnitBrowserCompatCookieSpec(webClient.getBrowserVersion(),
-                        webClient_.getIncorrectnessListener());
+                return new HtmlUnitBrowserCompatCookieSpec(webClient.getBrowserVersion());
             }
         };
         httpContext_ = new HttpClientContext();
@@ -237,19 +222,6 @@
         return new HttpHost(url.getHost(), url.getPort(), url.getProtocol());
     }
 
-//    private static void setProxy(final HttpUriRequest httpUriRequest, final WebRequest webRequest) {
-//        if (webRequest.getProxyHost() != null) {
-//            final HttpHost proxy = new HttpHost(webRequest.getProxyHost(), webRequest.getProxyPort());
-//            final HttpParams httpRequestParams = httpUriRequest.getParams();
-//            if (webRequest.isSocksProxy()) {
-//                SocksSocketFactory.setSocksProxy(httpRequestParams, proxy);
-//            }
-//            else {
-//                httpRequestParams.setParameter(ConnRoutePNames.DEFAULT_PROXY, proxy);
-//            }
-//        }
-//    }
-
     private void setProxy(final HttpRequestBase httpRequest, final WebRequest webRequest) {
         final RequestConfig.Builder requestBuilder = createRequestConfig();
         configureTimeout(requestBuilder, webClient_.getOptions().getTimeout());
@@ -367,7 +339,6 @@
         }
 
         writeRequestHeadersToHttpMethod(httpMethod, webRequest.getAdditionalHeaders());
-//        getHttpClient().getParams().setParameter(ClientPNames.HANDLE_REDIRECTS, true);
 
         final HttpClientBuilder httpClient = getHttpClientBuilder();
 
@@ -761,132 +732,6 @@
 }
 
 /**
- * Workaround for <a href="https://issues.apache.org/jira/browse/HTTPCLIENT-1006">HttpClient bug 1006</a>:
- * quotes are wrongly removed in cookie's values.
- */
-class HtmlUnitBrowserCompatCookieSpec extends BrowserCompatSpec {
-    /**
-     * Comparator for sending cookies in right order.
-     * See specification:
-     * - RFC2109 (#4.3.4) http://www.ietf.org/rfc/rfc2109.txt
-     * - RFC2965 (#3.3.4) http://www.ietf.org/rfc/rfc2965.txt http://www.ietf.org/rfc/rfc2109.txt
-     */
-    private static final Comparator<Cookie> COOKIE_COMPARATOR = new CookiePathComparator();
-
-    private static final Date DATE_1_1_1970;
-
-    static {
-        final Calendar calendar = Calendar.getInstance();
-        calendar.setTimeZone(DateUtils.GMT);
-        calendar.set(1970, Calendar.JANUARY, 1, 0, 0, 0);
-        calendar.set(Calendar.MILLISECOND, 0);
-        DATE_1_1_1970 = calendar.getTime();
-    }
-
-    // simplified patterns from BrowserCompatSpec, with yy patterns before similar yyyy patterns
-    private static final String[] DEFAULT_DATE_PATTERNS = new String[] {
-        "EEE dd MMM yy HH mm ss zzz",
-        "EEE dd MMM yyyy HH mm ss zzz",
-        "EEE MMM d HH mm ss yyyy",
-        "EEE dd MMM yy HH mm ss z ",
-        "EEE dd MMM yyyy HH mm ss z ",
-        "EEE dd MM yy HH mm ss z ",
-        "EEE dd MM yyyy HH mm ss z ",
-    };
-    private static final String[] EXTENDED_DATE_PATTERNS = new String[] {
-        "EEE dd MMM yy HH mm ss zzz",
-        "EEE dd MMM yyyy HH mm ss zzz",
-        "EEE MMM d HH mm ss yyyy",
-        "EEE dd MMM yy HH mm ss z ",
-        "EEE dd MMM yyyy HH mm ss z ",
-        "EEE dd MM yy HH mm ss z ",
-        "EEE dd MM yyyy HH mm ss z ",
-        "d/M/yyyy",
-    };
-
-    HtmlUnitBrowserCompatCookieSpec(final BrowserVersion browserVersion,
-            final IncorrectnessListener incorrectnessListener) {
-        super();
-        final BasicPathHandler pathHandler = new BasicPathHandler() {
-            @Override
-            public void validate(final Cookie cookie, final CookieOrigin origin) throws MalformedCookieException {
-                // nothing, browsers seem not to perform any validation
-            }
-        };
-        registerAttribHandler(ClientCookie.PATH_ATTR, pathHandler);
-
-        final CookieAttributeHandler originalExpiresHandler = getAttribHandler(ClientCookie.EXPIRES_ATTR);
-        final CookieAttributeHandler wrapperExpiresHandler = new CookieAttributeHandler() {
-
-            public void validate(final Cookie cookie, final CookieOrigin origin) throws MalformedCookieException {
-                originalExpiresHandler.validate(cookie, origin);
-            }
-
-            public void parse(final SetCookie cookie, String value) throws MalformedCookieException {
-                if (value.startsWith("\"") && value.endsWith("\"")) {
-                    value = value.substring(1, value.length() - 1);
-                }
-                value = value.replaceAll("[ ,:-]+", " ");
-
-                Date startDate = null;
-                if (browserVersion.hasFeature(HTTP_COOKIE_START_DATE_1970)) {
-                    startDate = DATE_1_1_1970;
-                }
-
-                String[] datePatterns = DEFAULT_DATE_PATTERNS;
-                if (browserVersion.hasFeature(HTTP_COOKIE_EXTENDED_DATE_PATTERNS)) {
-                    datePatterns = EXTENDED_DATE_PATTERNS;
-                }
-
-                cookie.setExpiryDate(DateUtils.parseDate(value, datePatterns, startDate));
-            }
-
-            public boolean match(final Cookie cookie, final CookieOrigin origin) {
-                return originalExpiresHandler.match(cookie, origin);
-            }
-        };
-        registerAttribHandler(ClientCookie.EXPIRES_ATTR, wrapperExpiresHandler);
-
-        final CookieAttributeHandler httpOnlyHandler = new CookieAttributeHandler() {
-            public void validate(final Cookie cookie, final CookieOrigin origin) throws MalformedCookieException {
-                // nothing
-            }
-
-            public void parse(final SetCookie cookie, final String value) throws MalformedCookieException {
-                ((BasicClientCookie) cookie).setAttribute("httponly", "true");
-            }
-
-            public boolean match(final Cookie cookie, final CookieOrigin origin) {
-                return true;
-            }
-        };
-        registerAttribHandler("httponly", httpOnlyHandler);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public List<Cookie> parse(final Header header, final CookieOrigin origin) throws MalformedCookieException {
-        final List<Cookie> cookies = super.parse(header, origin);
-        for (final Cookie c : cookies) {
-            // re-add quotes around value if parsing as incorrectly trimmed them
-            if (header.getValue().contains(c.getName() + "=\"" + c.getValue())) {
-                ((BasicClientCookie) c).setValue('"' + c.getValue() + '"');
-            }
-        }
-        return cookies;
-    }
-
-    @Override
-    public List<Header> formatCookies(final List<Cookie> cookies) {
-        Collections.sort(cookies, COOKIE_COMPARATOR);
-
-        return super.formatCookies(cookies);
-    }
-}
-
-/**
  * Implementation of {@link CookieStore} like {@link org.apache.http.impl.client.BasicCookieStore}
  * BUT storing cookies in the order of addition.
  * @author Marc Guillemot

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java	2014-03-30 12:18:39 UTC (rev 9216)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java	2014-03-30 13:52:14 UTC (rev 9217)
@@ -34,9 +34,11 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.ConcurrentModificationException;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -50,6 +52,7 @@
 import org.apache.http.HttpStatus;
 import org.apache.http.NoHttpResponseException;
 import org.apache.http.client.CredentialsProvider;
+import org.apache.http.cookie.CookieOrigin;
 import org.w3c.css.sac.ErrorHandler;
 
 import com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLActiveXObjectFactory;
@@ -75,6 +78,7 @@
 import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLDocument;
 import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLElement;
 import com.gargoylesoftware.htmlunit.protocol.data.DataUrlDecoder;
+import com.gargoylesoftware.htmlunit.util.Cookie;
 import com.gargoylesoftware.htmlunit.util.NameValuePair;
 import com.gargoylesoftware.htmlunit.util.UrlUtils;
 
@@ -2103,4 +2107,47 @@
     public StorageHolder getStorageHolder() {
         return storageHolder_;
     }
+
+    /**
+     * Returns the currently configured cookies applicable to the specified URL, in an unmodifiable set.
+     * If disabled, this returns an empty set.
+     * @param url the URL on which to filter the returned cookies
+     * @return the currently configured cookies applicable to the specified URL, in an unmodifiable set
+     */
+    public synchronized Set<Cookie> getCookies(final URL url) {
+        final CookieManager cookieManager = getCookieManager();
+
+        if (!cookieManager.isCookiesEnabled()) {
+            return Collections.<Cookie>emptySet();
+        }
+
+        final String host = url.getHost();
+        // URLs like "about:blank" don't have cookies and we need to catch these
+        // cases here before HttpClient complains
+        if (host.isEmpty()) {
+            return Collections.emptySet();
+        }
+
+        final String path = url.getPath();
+        final String protocol = url.getProtocol();
+        final boolean secure = "https".equals(protocol);
+
+        final int port = cookieManager.getPort(url);
+
+        // discard expired cookies
+        cookieManager.clearExpired(new Date());
+
+        final org.apache.http.cookie.Cookie[] all = Cookie.toHttpClient(cookieManager.getCookies());
+        final CookieOrigin cookieOrigin = new CookieOrigin(host, port, path, secure);
+        final List<org.apache.http.cookie.Cookie> matches = new ArrayList<org.apache.http.cookie.Cookie>();
+        for (final org.apache.http.cookie.Cookie cookie : all) {
+            if (new HtmlUnitBrowserCompatCookieSpec(getBrowserVersion()).match(cookie, cookieOrigin)) {
+                matches.add(cookie);
+            }
+        }
+
+        final Set<Cookie> cookies = new LinkedHashSet<Cookie>();
+        cookies.addAll(Cookie.fromHttpClient(matches));
+        return Collections.unmodifiableSet(cookies);
+    }
 }

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocument.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocument.java	2014-03-30 12:18:39 UTC (rev 9216)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocument.java	2014-03-30 13:52:14 UTC (rev 9217)
@@ -816,7 +816,7 @@
         url = replaceForCookieIfNecessary(url);
 
         final StringBuilder buffer = new StringBuilder();
-        final Set<Cookie> cookies = page.getWebClient().getCookieManager().getCookies(url);
+        final Set<Cookie> cookies = page.getWebClient().getCookies(url);
         for (final Cookie cookie : cookies) {
             if (cookie.isHttpOnly()) {
                 continue;

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/CookieManager2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/CookieManager2Test.java	2014-03-30 12:18:39 UTC (rev 9216)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/CookieManager2Test.java	2014-03-30 13:52:14 UTC (rev 9217)
@@ -119,7 +119,7 @@
         final WebClient webClient = getWebClient();
         final HtmlPage htmlPage = webClient.getPage("about:blank");
 
-        final Set<Cookie> cookies = webClient.getCookieManager().getCookies(htmlPage.getUrl());
+        final Set<Cookie> cookies = webClient.getCookies(htmlPage.getUrl());
         assertTrue(cookies.toString(), cookies.isEmpty());
     }
 

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/CookieManagerTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/CookieManagerTest.java	2014-03-30 12:18:39 UTC (rev 9216)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/CookieManagerTest.java	2014-03-30 13:52:14 UTC (rev 9217)
@@ -501,6 +501,27 @@
     }
 
     /**
+     * Response to /a/b sets cookie to /foo/blah.
+     * @throws Exception if the test fails
+     */
+    @Test
+    @Alerts(DEFAULT = "first=1; second=2")
+    public void setCookieDifferentPathSlashAtEnd() throws Exception {
+        final List<NameValuePair> responseHeader1 = new ArrayList<NameValuePair>();
+        responseHeader1.add(new NameValuePair("Set-Cookie", "first=1; path=/foo"));
+        responseHeader1.add(new NameValuePair("Set-Cookie", "second=2; path=/foo/"));
+        responseHeader1.add(new NameValuePair("Set-Cookie", "third=3; path=/foo/other"));
+        responseHeader1.add(new NameValuePair("Set-Cookie", "fourth=4; path=/other/path"));
+        responseHeader1.add(new NameValuePair("Location", "/foo/"));
+
+        getMockWebConnection().setDefaultResponse(HTML_ALERT_COOKIE);
+        final URL firstUrl = new URL(getDefaultUrl(), "/a/b");
+        getMockWebConnection().setResponse(firstUrl, "", 302, "Moved", "text/html", responseHeader1);
+
+        loadPageWithAlerts2(firstUrl);
+    }
+
+    /**
      * Test for document.cookie for cookies expiered after the page was loaded.
      * @throws Exception if the test fails
      */
@@ -508,7 +529,7 @@
     @Alerts(DEFAULT = {"cookies: first=1", "cookies: " })
     public void setCookieTimeout() throws Exception {
         final List<NameValuePair> responseHeader1 = new ArrayList<NameValuePair>();
-        final String expires = DateUtils.formatDate(new Date(System.currentTimeMillis() + 10000));
+        final String expires = DateUtils.formatDate(new Date(System.currentTimeMillis() + 1000));
         responseHeader1.add(new NameValuePair("Set-Cookie", "first=1; expires=" + expires + "; path=/foo"));
         responseHeader1.add(new NameValuePair("Location", "/foo/content.html"));
 
@@ -523,7 +544,7 @@
                 + "<body>\n"
                 + "<script>\n"
                 + "  alertCookies();\n"
-                + "  window.setTimeout(alertCookies, 11000);\n"
+                + "  window.setTimeout(alertCookies, 1100);\n"
                 + "</script>"
                 + "</body>\n"
                 + "</html>";





Thread: [HtmlUnit] SVN: [9217] trunk/htmlunit/src (Page 18)

Java GUI-Less browser, supporting JavaScript, to run against web pages

htmlunit-develop