Apache
/
httpcomponents-client
mirror of https://github.com/apache/httpcomponents-client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HTTPCLIENT-1685: PublicSuffixDomainFilter to ignore local hosts and local domains 

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/branches/4.5.x@1706576 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oleg Kalnichevski 2015-10-03 13:07:21 +00:00
parent b6c1516e61
commit e3232f5425
2 changed files with 52 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
httpclient/src/main/java/org/apache/http/impl/cookie/PublicSuffixDomainFilter.java
View File

@ -26,6 +26,9 @@
*/
package org.apache.http.impl.cookie;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.http.annotation.Immutable;
import org.apache.http.conn.util.PublicSuffixList;
import org.apache.http.conn.util.PublicSuffixMatcher;
@ -52,11 +55,23 @@ public class PublicSuffixDomainFilter implements CommonCookieAttributeHandler {
private final CommonCookieAttributeHandler handler;
private final PublicSuffixMatcher publicSuffixMatcher;
private final Map<String, Boolean> localDomainMap;
private static Map<String, Boolean> createLocalDomainMap() {
final ConcurrentHashMap<String, Boolean> map = new ConcurrentHashMap<String, Boolean>();
map.put(".localhost.", Boolean.TRUE); // RFC 6761
map.put(".test.", Boolean.TRUE); // RFC 6761
map.put(".local.", Boolean.TRUE); // RFC 6762
map.put(".local", Boolean.TRUE);
map.put(".localdomain", Boolean.TRUE);
return map;
}
public PublicSuffixDomainFilter(
final CommonCookieAttributeHandler handler, final PublicSuffixMatcher publicSuffixMatcher) {
this.handler = Args.notNull(handler, "Cookie handler");
this.publicSuffixMatcher = Args.notNull(publicSuffixMatcher, "Public suffix matcher");
this.localDomainMap = createLocalDomainMap();
}
public PublicSuffixDomainFilter(
@ -65,6 +80,7 @@ public class PublicSuffixDomainFilter implements CommonCookieAttributeHandler {
Args.notNull(suffixList, "Public suffix list");
this.handler = handler;
this.publicSuffixMatcher = new PublicSuffixMatcher(suffixList.getRules(), suffixList.getExceptions());
this.localDomainMap = createLocalDomainMap();
}
/**
@ -72,12 +88,17 @@ public class PublicSuffixDomainFilter implements CommonCookieAttributeHandler {
*/
@Override
public boolean match(final Cookie cookie, final CookieOrigin origin) {
final String domain = cookie.getDomain();
if (!domain.equalsIgnoreCase("localhost") && publicSuffixMatcher.matches(domain)) {
return false;
} else {
return handler.match(cookie, origin);
final String host = cookie.getDomain();
final int i = host.indexOf('.');
if (i >= 0) {
final String domain = host.substring(i);
if (!this.localDomainMap.containsKey(domain)) {
if (this.publicSuffixMatcher.matches(host)) {
return false;
}
}
}
return handler.match(cookie, origin);
}
@Override

26
httpclient/src/test/java/org/apache/http/impl/cookie/TestPublicSuffixListParser.java
View File

@ -78,6 +78,32 @@ public class TestPublicSuffixListParser {
Assert.assertTrue(filter.match(cookie, new CookieOrigin("apache.metro.tokyo.jp", 80, "/stuff", false)));
}
@Test
public void testParseLocal() throws Exception {
final BasicClientCookie cookie = new BasicClientCookie("name", "value");
cookie.setDomain("localhost");
Assert.assertTrue(filter.match(cookie, new CookieOrigin("localhost", 80, "/stuff", false)));
cookie.setDomain("somehost");
Assert.assertTrue(filter.match(cookie, new CookieOrigin("somehost", 80, "/stuff", false)));
cookie.setDomain(".localdomain");
Assert.assertTrue(filter.match(cookie, new CookieOrigin("somehost.localdomain", 80, "/stuff", false)));
cookie.setDomain(".local.");
Assert.assertTrue(filter.match(cookie, new CookieOrigin("somehost.local.", 80, "/stuff", false)));
cookie.setDomain(".localhost.");
Assert.assertTrue(filter.match(cookie, new CookieOrigin("somehost.localhost.", 80, "/stuff", false)));
cookie.setDomain(".local");
Assert.assertTrue(filter.match(cookie, new CookieOrigin("somehost.local", 80, "/stuff", false)));
cookie.setDomain(".blah");
Assert.assertFalse(filter.match(cookie, new CookieOrigin("somehost.blah", 80, "/stuff", false)));
}
@Test
public void testUnicode() throws Exception {
final BasicClientCookie cookie = new BasicClientCookie("name", "value");