Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -141,12 +141,14 @@ public String getDomainRoot(final String domain, final DomainType expectedType)
String normalized = DnsUtils.normalize(domain);
final boolean punyCoded = normalized.contains("xn-");
if (punyCoded) {
normalized = IDN.toUnicode(normalized);
// See DnsUtils.normalizeUnicode: some PSL labels are unassigned under the
// Unicode 3.2 repertoire IDN enforces by default and still need to decode.
normalized = IDN.toUnicode(normalized, IDN.ALLOW_UNASSIGNED);
}
final DomainRootInfo match = resolveDomainRoot(normalized, expectedType);
String domainRoot = match != null ? match.root : null;
if (domainRoot != null && punyCoded) {
domainRoot = IDN.toASCII(domainRoot);
domainRoot = IDN.toASCII(domainRoot, IDN.ALLOW_UNASSIGNED);
}
return domainRoot;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,11 @@ public static String normalizeUnicode(final String s) {
}
String decoded;
try {
decoded = IDN.toUnicode(s);
// Unassigned code points must still decode: the Public Suffix List contains
// labels (for example Balinese, Unicode 5.0) that are unassigned under the
// Unicode 3.2 repertoire IDN enforces by default, and are stored in the PSL
// in decoded form.
decoded = IDN.toUnicode(s, IDN.ALLOW_UNASSIGNED);
} catch (final IllegalArgumentException ignore) {
decoded = s;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,34 @@ void testNoArgSpecsUsePublicSuffixMatcher() throws Exception {
}
}

/**
* xn--9tfky.id (ᬩᬮᬶ.id) is a real Mozilla Public Suffix List entry whose
* Unicode label is unassigned under the Unicode 3.2 repertoire java.net.IDN enforces by
* default. Without IDN.ALLOW_UNASSIGNED the matcher never decodes it, so it falls
* through to treating it as an ordinary registrable domain instead of a public suffix.
*/
@Test
void testNoArgSpecsRejectUnassignedCodePointSuffix() throws Exception {
final CookieOrigin evilTenant = new CookieOrigin("evil-tenant.xn--9tfky.id", 80, "/", false);
final CookieOrigin otherTenant = new CookieOrigin("other-tenant.xn--9tfky.id", 80, "/", false);
final CookieOrigin legitOrigin = new CookieOrigin("foo.legit.xn--9tfky.id", 80, "/", false);
final CookieOrigin legitSibling = new CookieOrigin("bar.legit.xn--9tfky.id", 80, "/", false);
final List<CookieSpec> cookieSpecs = Arrays.asList(new RFC6265LaxSpec(), new RFC6265StrictSpec());

for (final CookieSpec cookieSpec : cookieSpecs) {
// A cookie for the bare public suffix itself must not reach another tenant under it.
final Cookie suffixCookie = cookieSpec.parse(
new BasicHeader("Set-Cookie", "name=value; Domain=xn--9tfky.id"), evilTenant).get(0);
Assertions.assertFalse(cookieSpec.match(suffixCookie, otherTenant));

// A cookie for a genuine registrable domain under the suffix is still a valid
// cookie domain and reaches siblings under it, like any ordinary domain.
final Cookie legitCookie = cookieSpec.parse(
new BasicHeader("Set-Cookie", "name=value; Domain=legit.xn--9tfky.id"), legitOrigin).get(0);
Assertions.assertTrue(cookieSpec.match(legitCookie, legitSibling));
}
}

@Test
void testPathMatchingWithTrailingSlash() throws Exception {
final CookieSpec cookieSpec = new RFC6265StrictSpec();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,40 @@ void testVerifyUnicode() {
Assertions.assertTrue(matcher.verify("foo.xn--h-2fa.no"));
}

/**
* ᬩᬮᬶ.test (A-label xn--9tfky.test) exercises a public suffix whose
* Unicode label is unassigned under Unicode 3.2, unlike hå.no above whose å
* has been assigned since Unicode 1.0. {@link java.net.IDN#toUnicode(String)} without
* {@link java.net.IDN#ALLOW_UNASSIGNED} silently fails to decode such a label, so the
* matcher must still recognise it as the public suffix it is, in both the ACE and the
* Unicode form, and a genuine subdomain under it must still be a valid cookie domain.
* Confirmed against the crafted fixture and, for verify(), against the real, unmodified
* Mozilla Public Suffix List too (rule ᬩᬮᬶ.id, A-label xn--9tfky.id).
*/
@Test
void testUnassignedCodePoint() {
Assertions.assertEquals("q.xn--9tfky.test", matcher.getDomainRoot("q.xn--9tfky.test"));
Assertions.assertEquals("q.ᬩᬮᬶ.test", matcher.getDomainRoot("q.ᬩᬮᬶ.test"));
Assertions.assertNull(matcher.getDomainRoot("xn--9tfky.test"));
Assertions.assertNull(matcher.getDomainRoot("ᬩᬮᬶ.test"));

Assertions.assertTrue(matcher.matches(".xn--9tfky.test"));
Assertions.assertTrue(matcher.matches(".ᬩᬮᬶ.test"));

// The bare public suffix, in either form, must never be a valid cookie domain.
Assertions.assertFalse(matcher.verify("xn--9tfky.test"));
Assertions.assertFalse(matcher.verify("ᬩᬮᬶ.test"));
// A genuine registrable domain under it is still allowed, in either form.
Assertions.assertTrue(matcher.verify("evil-tenant.xn--9tfky.test"));
Assertions.assertTrue(matcher.verify("evil-tenant.ᬩᬮᬶ.test"));

// Same, against the real, live Mozilla Public Suffix List, not just the fixture.
Assertions.assertFalse(pslMatcher.verify("xn--9tfky.id"));
Assertions.assertFalse(pslMatcher.verify("ᬩᬮᬶ.id"));
Assertions.assertTrue(pslMatcher.verify("evil-tenant.xn--9tfky.id"));
Assertions.assertTrue(pslMatcher.verify("evil-tenant.ᬩᬮᬶ.id"));
}

private void checkPublicSuffix(final String input, final String expected) {
Assertions.assertEquals(expected, pslMatcher.getDomainRoot(input));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,44 @@ void testMatchDNSName() throws Exception {
publicSuffixMatcher);
}

/**
* matchDNSName normalizes the host and the SAN with DnsUtils.normalizeUnicode before
* calling matchIdentity, which in turn calls PublicSuffixMatcher.verifyInternal directly,
* bypassing PublicSuffixMatcher.verify. ᬩᬮᬶ.test (A-label xn--9tfky.test)
* is a public suffix whose Unicode label is unassigned under Unicode 3.2, so this exercises
* the same decode path as the cookie bug, but on the TLS hostname verification path.
*/
@Test
void testMatchDNSNameUnassignedCodePoint() throws Exception {
// A genuine subdomain under the suffix is a valid identity, in ACE or Unicode form.
DefaultHostnameVerifier.matchDNSName(
"evil-tenant.xn--9tfky.test",
Collections.singletonList(SubjectName.DNS("evil-tenant.xn--9tfky.test")),
publicSuffixMatcher);
DefaultHostnameVerifier.matchDNSName(
"evil-tenant.ᬩᬮᬶ.test",
Collections.singletonList(SubjectName.DNS("evil-tenant.ᬩᬮᬶ.test")),
publicSuffixMatcher);
// A non-wildcard certificate for the bare public suffix itself must be rejected,
// in ACE or Unicode form, exactly as it already is for an ASCII multi-label
// suffix such as gov.uk (verified below as a control, same shape, no IDN involved).
Assertions.assertThrows(SSLException.class, () ->
DefaultHostnameVerifier.matchDNSName(
"xn--9tfky.test",
Collections.singletonList(SubjectName.DNS("xn--9tfky.test")),
publicSuffixMatcher));
Assertions.assertThrows(SSLException.class, () ->
DefaultHostnameVerifier.matchDNSName(
"ᬩᬮᬶ.test",
Collections.singletonList(SubjectName.DNS("ᬩᬮᬶ.test")),
publicSuffixMatcher));
Assertions.assertThrows(SSLException.class, () ->
DefaultHostnameVerifier.matchDNSName(
"gov.uk",
Collections.singletonList(SubjectName.DNS("gov.uk")),
publicSuffixMatcher));
}

@Test
void testMatchIdentity() {
// Test 1: IDN matching punycode
Expand Down
4 changes: 4 additions & 0 deletions httpclient5/src/test/resources/suffixlistmatcher.txt
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,8 @@ gov.uk
no
hå.no

// unicode, Balinese script (Unicode 5.0, unassigned under Unicode 3.2 / IDNA2003)
test
ᬩᬮᬶ.test

// ===END ICANN DOMAINS===
Loading