From a25622115ff8ec2575ce3b41ed097118f6e47f06 Mon Sep 17 00:00:00 2001 From: Mohammed Hassan Date: Fri, 20 Nov 2026 12:39:31 +0530 Subject: [PATCH] apply the public suffix filter in the no-arg RFC6265CookieSpecFactory --- .../hc/client5/http/impl/cookie/RFC6265CookieSpecFactory.java | 3 ++- .../hc/client5/http/impl/cookie/TestRFC6265CookieSpec.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265CookieSpecFactory.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265CookieSpecFactory.java index b64200b3c5..adc35f691a 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265CookieSpecFactory.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265CookieSpecFactory.java @@ -35,6 +35,7 @@ import org.apache.hc.client5.http.cookie.CookieSpecFactory; import org.apache.hc.client5.http.cookie.MalformedCookieException; import org.apache.hc.client5.http.psl.PublicSuffixMatcher; +import org.apache.hc.client5.http.psl.PublicSuffixMatcherLoader; import org.apache.hc.client5.http.utils.DateUtils; import org.apache.hc.core5.annotation.Contract; import org.apache.hc.core5.annotation.ThreadingBehavior; @@ -77,7 +78,7 @@ public RFC6265CookieSpecFactory(final PublicSuffixMatcher publicSuffixMatcher) { } public RFC6265CookieSpecFactory() { - this(CompatibilityLevel.RELAXED, null); + this(CompatibilityLevel.RELAXED, PublicSuffixMatcherLoader.getDefault()); } @Override 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..7e2beee449 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 @@ -80,7 +80,8 @@ void testNoArgSpecsUsePublicSuffixMatcher() throws Exception { final CookieOrigin exampleOrigin = new CookieOrigin("foo.example.com", 80, "/", false); final CookieOrigin exampleSibling = new CookieOrigin("bar.example.com", 80, "/", false); final CookieOrigin publicSuffixSibling = new CookieOrigin("bar.com", 80, "/", false); - final List cookieSpecs = Arrays.asList(new RFC6265LaxSpec(), new RFC6265StrictSpec()); + final List cookieSpecs = Arrays.asList(new RFC6265LaxSpec(), new RFC6265StrictSpec(), + new RFC6265CookieSpecFactory().create(null)); for (final CookieSpec cookieSpec : cookieSpecs) { final Cookie publicSuffixCookie = cookieSpec.parse(