Return-Path: X-Original-To: apmail-hc-commits-archive@www.apache.org Delivered-To: apmail-hc-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9A73A1171B for ; Mon, 11 Aug 2014 13:33:17 +0000 (UTC) Received: (qmail 53067 invoked by uid 500); 11 Aug 2014 13:33:17 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 53032 invoked by uid 500); 11 Aug 2014 13:33:17 -0000 Mailing-List: contact commits-help@hc.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "HttpComponents Project" Delivered-To: mailing list commits@hc.apache.org Received: (qmail 53023 invoked by uid 99); 11 Aug 2014 13:33:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Aug 2014 13:33:17 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Aug 2014 13:32:49 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7B51423888D2 for ; Mon, 11 Aug 2014 13:32:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1617278 - in /httpcomponents/httpclient/trunk/httpclient/src: main/java/org/apache/http/impl/cookie/ test/java/org/apache/http/impl/cookie/ Date: Mon, 11 Aug 2014 13:32:47 -0000 To: commits@hc.apache.org From: olegk@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140811133247.7B51423888D2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olegk Date: Mon Aug 11 13:32:46 2014 New Revision: 1617278 URL: http://svn.apache.org/r1617278 Log: CookieNetscapeDraft to ignore Version and Max-Age attributes; BrowserCompatSpec to reset cookie version to 0 for Neetscape style cookies Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpec.java httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpec.java httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestBrowserCompatSpec.java httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestCookieNetscapeDraft.java Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpec.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpec.java?rev=1617278&r1=1617277&r2=1617278&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpec.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpec.java Mon Aug 11 13:32:46 2014 @@ -28,15 +28,19 @@ package org.apache.http.impl.cookie; import java.util.ArrayList; +import java.util.Collections; import java.util.List; +import java.util.Locale; import org.apache.http.FormattedHeader; import org.apache.http.Header; import org.apache.http.HeaderElement; +import org.apache.http.NameValuePair; import org.apache.http.annotation.NotThreadSafe; 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.MalformedCookieException; import org.apache.http.cookie.SM; @@ -133,7 +137,7 @@ public class BrowserCompatSpec extends C throw new MalformedCookieException("Unrecognized cookie header '" + header.toString() + "'"); } - HeaderElement[] helems = header.getElements(); + final HeaderElement[] helems = header.getElements(); boolean versioned = false; boolean netscape = false; for (final HeaderElement helem: helems) { @@ -164,9 +168,35 @@ public class BrowserCompatSpec extends C buffer.append(s); cursor = new ParserCursor(0, buffer.length()); } - helems = new HeaderElement[] { parser.parseHeader(buffer, cursor) }; + final HeaderElement elem = parser.parseHeader(buffer, cursor); + final String name = elem.getName(); + final String value = elem.getValue(); + if (name == null || name.isEmpty()) { + throw new MalformedCookieException("Cookie name may not be empty"); + } + final BasicClientCookie cookie = new BasicClientCookie(name, value); + cookie.setPath(getDefaultPath(origin)); + cookie.setDomain(getDefaultDomain(origin)); + + // cycle through the parameters + final NameValuePair[] attribs = elem.getParameters(); + for (int j = attribs.length - 1; j >= 0; j--) { + final NameValuePair attrib = attribs[j]; + final String s = attrib.getName().toLowerCase(Locale.ROOT); + cookie.setAttribute(s, attrib.getValue()); + final CookieAttributeHandler handler = findAttribHandler(s); + if (handler != null) { + handler.parse(cookie, attrib.getValue()); + } + } + // Override version for Netscape style cookies + if (netscape) { + cookie.setVersion(0); + } + return Collections.singletonList(cookie); + } else { + return parse(helems, origin); } - return parse(helems, origin); } private static boolean isQuoteEnclosed(final String s) { Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpec.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpec.java?rev=1617278&r1=1617277&r2=1617278&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpec.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpec.java Mon Aug 11 13:32:46 2014 @@ -69,7 +69,6 @@ public class NetscapeDraftSpec extends C } registerAttribHandler(ClientCookie.PATH_ATTR, new BasicPathHandler()); registerAttribHandler(ClientCookie.DOMAIN_ATTR, new NetscapeDomainHandler()); - registerAttribHandler(ClientCookie.MAX_AGE_ATTR, new BasicMaxAgeHandler()); registerAttribHandler(ClientCookie.SECURE_ATTR, new BasicSecureHandler()); registerAttribHandler(ClientCookie.COMMENT_ATTR, new BasicCommentHandler()); registerAttribHandler(ClientCookie.EXPIRES_ATTR, new BasicExpiresHandler( Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestBrowserCompatSpec.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestBrowserCompatSpec.java?rev=1617278&r1=1617277&r2=1617278&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestBrowserCompatSpec.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestBrowserCompatSpec.java Mon Aug 11 13:32:46 2014 @@ -460,7 +460,7 @@ public class TestBrowserCompatSpec { Assert.assertTrue("Secure",cookies.get(0).isSecure()); Assert.assertEquals(new Date(10000L),cookies.get(0).getExpiryDate()); Assert.assertEquals("Comment","This is a comment.",cookies.get(0).getComment()); - Assert.assertEquals("Version",1,cookies.get(0).getVersion()); + Assert.assertEquals("Version",0,cookies.get(0).getVersion()); } @Test Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestCookieNetscapeDraft.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestCookieNetscapeDraft.java?rev=1617278&r1=1617277&r2=1617278&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestCookieNetscapeDraft.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestCookieNetscapeDraft.java Mon Aug 11 13:32:46 2014 @@ -132,6 +132,25 @@ public class TestCookieNetscapeDraft { } } + @Test + public void testParseVersionIgnored() throws Exception { + final Header header = new BasicHeader("Set-Cookie", "name1=value1;Path=/path/;Version=1;"); + + final CookieSpec cookiespec = new NetscapeDraftSpec(); + final CookieOrigin origin = new CookieOrigin("host", 80, "/path/", true); + final List cookies = cookiespec.parse(header, origin); + for (int i = 0; i < cookies.size(); i++) { + cookiespec.validate(cookies.get(i), origin); + } + Assert.assertEquals("Found 1 cookies.",1,cookies.size()); + final Cookie cookie = cookies.get(0); + Assert.assertEquals("Name","name1", cookie.getName()); + Assert.assertEquals("Value", "value1", cookie.getValue()); + Assert.assertEquals("Domain", "host", cookie.getDomain()); + Assert.assertEquals("Path","/path/", cookie.getPath()); + Assert.assertEquals(0, cookie.getVersion()); + } + /** * Tests Netscape specific cookie formatting. */