From d6d41eece0a69d3d07cd7ba8907435005fabdad5 Mon Sep 17 00:00:00 2001 From: Mohammed Hassan Date: Fri, 20 Nov 2026 16:34:47 +0530 Subject: [PATCH] ignore Domain attributes ending with '.' in RFC6265CookieSpec --- .../http/impl/cookie/RFC6265CookieSpec.java | 4 +++- .../impl/cookie/TestRFC6265CookieSpec.java | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265CookieSpec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265CookieSpec.java index 1314032a85..9fcf6c77b4 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265CookieSpec.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265CookieSpec.java @@ -185,7 +185,9 @@ private RawCookie parseCookie(final CharSequence buffer, } } } - if (!Cookie.DOMAIN_ATTR.equals(paramName) || !TextUtils.isBlank(paramValue)) { + // Ignore empty 'Domain' attributes and those ending with '.' so the cookie stays host-only + if (!Cookie.DOMAIN_ATTR.equals(paramName) + || !TextUtils.isBlank(paramValue) && !paramValue.endsWith(".")) { attribMap.put(paramName, paramValue); } } diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/cookie/TestRFC6265CookieSpec.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/cookie/TestRFC6265CookieSpec.java index 2b5507da99..4dbd59a122 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/cookie/TestRFC6265CookieSpec.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/cookie/TestRFC6265CookieSpec.java @@ -74,6 +74,25 @@ void testEmptyDomainAttributeIgnored() throws Exception { Assertions.assertEquals("example.com", cookieWithEmptyDomainFirst.getDomain()); } + @Test + void testTrailingDotDomainAttributeIgnored() throws Exception { + final RFC6265CookieSpec cookiespec = new RFC6265StrictSpec(); + final CookieOrigin origin = new CookieOrigin("example.com", 80, "/", false); + + final Cookie hostOnlyCookie = cookiespec.parse( + new BasicHeader("Set-Cookie", "name=value; Domain=example.com."), origin).get(0); + cookiespec.validate(hostOnlyCookie, origin); + Assertions.assertEquals("example.com", hostOnlyCookie.getDomain()); + Assertions.assertFalse(hostOnlyCookie.containsAttribute(Cookie.DOMAIN_ATTR)); + Assertions.assertTrue(cookiespec.match(hostOnlyCookie, origin)); + Assertions.assertFalse(cookiespec.match(hostOnlyCookie, + new CookieOrigin("sub.example.com", 80, "/", false))); + + final Cookie cookie = cookiespec.parse( + new BasicHeader("Set-Cookie", "name=value; Domain=example.com; Domain=foo."), origin).get(0); + Assertions.assertEquals("example.com", cookie.getAttribute(Cookie.DOMAIN_ATTR)); + } + @Test void testNoArgSpecsUsePublicSuffixMatcher() throws Exception { final CookieOrigin publicSuffixOrigin = new CookieOrigin("foo.com", 80, "/", false);