Changeset 237637 in webkit

Timestamp:

Oct 31, 2018, 8:19:24 AM (8 years ago)

Author:

Claudio Saavedra

Message:

[GTK][WPE] Remaining topPrivatelyControlledDomain() fixes
​https://bugs.webkit.org/show_bug.cgi?id=191110

Reviewed by Michael Catanzaro.

Covered by existing tests.

Turns out that this method is expected to reject domains that
are not registrable. Also sync with the Mac implementation in
that given domains that are not all ASCII should be returned
back as is. This fixes the remaining Public Suffix API tests.

• platform/soup/PublicSuffixSoup.cpp:

(WebCore::topPrivatelyControlledDomain):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/soup/PublicSuffixSoup.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-10-31  Claudio Saavedra  <csaavedra@igalia.com>
+
+        [GTK][WPE] Remaining topPrivatelyControlledDomain() fixes
+        https://bugs.webkit.org/show_bug.cgi?id=191110
+
+        Reviewed by Michael Catanzaro.
+
+        Covered by existing tests.
+
+        Turns out that this method is expected to reject domains that
+        are not registrable. Also sync with the Mac implementation in
+        that given domains that are not all ASCII should be returned
+        back as is. This fixes the remaining Public Suffix API tests.
+
+        * platform/soup/PublicSuffixSoup.cpp:
+        (WebCore::topPrivatelyControlledDomain):
+
 2018-10-31  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/platform/soup/PublicSuffixSoup.cpp

@@ -46 +46 @@
     if (domain.isEmpty())
         return String();
+    if (!domain.isAllASCII())
+        return domain;
 
     String lowercaseDomain = domain.convertToASCIILowercase();
@@ -58 +60 @@
         return String::fromUTF8(baseDomain);
 
-    if (g_error_matches(error.get(), SOUP_TLD_ERROR, SOUP_TLD_ERROR_INVALID_HOSTNAME) || g_error_matches(error.get(), SOUP_TLD_ERROR, SOUP_TLD_ERROR_NOT_ENOUGH_DOMAINS))
+    if (g_error_matches(error.get(), SOUP_TLD_ERROR, SOUP_TLD_ERROR_INVALID_HOSTNAME) || g_error_matches(error.get(), SOUP_TLD_ERROR, SOUP_TLD_ERROR_NOT_ENOUGH_DOMAINS) || g_error_matches(error.get(), SOUP_TLD_ERROR, SOUP_TLD_ERROR_NO_BASE_DOMAIN))
         return String();
 
-    if (g_error_matches(error.get(), SOUP_TLD_ERROR, SOUP_TLD_ERROR_IS_IP_ADDRESS) || g_error_matches(error.get(), SOUP_TLD_ERROR, SOUP_TLD_ERROR_NO_BASE_DOMAIN))
+    if (g_error_matches(error.get(), SOUP_TLD_ERROR, SOUP_TLD_ERROR_IS_IP_ADDRESS))
         return domain;