Changeset 236527 in webkit

Timestamp:

Sep 26, 2018, 2:56:31 PM (8 years ago)

Author:

achristensen@apple.com

Message:

uidna_nameToASCII only needs a buffer capacity of 64
​https://bugs.webkit.org/show_bug.cgi?id=190006

Reviewed by Chris Dumez.

Source/WebCore:

This is specified in ​https://www.unicode.org/reports/tr46/#ToASCII
This is how Chrome and Firefox also behave with long unicode hosts.

• platform/URLParser.cpp:

(WebCore::URLParser::domainToASCII):

LayoutTests:

• fast/dom/DOMURL/parsing.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/DOMURL/parsing-expected.txt (modified) (1 diff)
• LayoutTests/fast/dom/DOMURL/parsing.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/URLParser.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-09-26  Alex Christensen  <achristensen@webkit.org>
+
+        uidna_nameToASCII only needs a buffer capacity of 64
+        https://bugs.webkit.org/show_bug.cgi?id=190006
+
+        Reviewed by Chris Dumez.
+
+        * fast/dom/DOMURL/parsing.html:
+
 2018-09-26  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/LayoutTests/fast/dom/DOMURL/parsing-expected.txt

@@ -15 +15 @@
 PASS breakDownURL('http://ex%61mple.com/') is 'protocol=http:, host=example.com, pathname=/, origin=http://example.com, toString=http://example.com/'
 PASS breakDownURL('http://ex%2fmple.com/') threw exception TypeError: Type error.
+PASS i is 54
 PASS successfullyParsed is true
 

trunk/LayoutTests/fast/dom/DOMURL/parsing.html

@@ -58 +58 @@
 shouldThrow("breakDownURL('http://ex%2fmple.com/')");
 
+var longUnicodeDomain = "\u1234";
+var i = 0;
+try {
+    for (i = 0; i < 100; ++i) {
+        longUnicodeDomain += "a"
+        new URL("http://" + longUnicodeDomain + "/");
+    }
+} catch (e) { }
+shouldBe("i", "54");
+
 </script>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-09-26  Alex Christensen  <achristensen@webkit.org>
+
+        uidna_nameToASCII only needs a buffer capacity of 64
+        https://bugs.webkit.org/show_bug.cgi?id=190006
+
+        Reviewed by Chris Dumez.
+
+        This is specified in https://www.unicode.org/reports/tr46/#ToASCII
+        This is how Chrome and Firefox also behave with long unicode hosts.
+
+        * platform/URLParser.cpp:
+        (WebCore::URLParser::domainToASCII):
+
 2018-09-26  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/platform/URLParser.cpp

@@ -621 +621 @@
 void URLParser::encodeQuery(const Vector<UChar>& source, const TextEncoding& encoding, CodePointIterator<CharacterType> iterator)
 {
-    // FIXME: It is unclear in the spec what to do when encoding fails. The behavior should be specified and tested.
     auto encoded = encoding.encode(StringView(source.data(), source.size()), UnencodableHandling::URLEncodedEntities);
     auto* data = encoded.data();
@@ -2569 +2568 @@
     }
     
-    UChar hostnameBuffer[defaultInlineBufferSize];
+    const size_t maxDomainLength = 64;
+    UChar hostnameBuffer[maxDomainLength];
     UErrorCode error = U_ZERO_ERROR;
     UIDNAInfo processingDetails = UIDNA_INFO_INITIALIZER;
-    int32_t numCharactersConverted = uidna_nameToASCII(&internationalDomainNameTranscoder(), StringView(domain).upconvertedCharacters(), domain.length(), hostnameBuffer, defaultInlineBufferSize, &processingDetails, &error);
-    ASSERT(numCharactersConverted <= static_cast<int32_t>(defaultInlineBufferSize));
+    int32_t numCharactersConverted = uidna_nameToASCII(&internationalDomainNameTranscoder(), StringView(domain).upconvertedCharacters(), domain.length(), hostnameBuffer, maxDomainLength, &processingDetails, &error);
+    ASSERT(numCharactersConverted <= static_cast<int32_t>(maxDomainLength));
 
     if (U_SUCCESS(error) && !processingDetails.errors) {
@@ -2585 +2585 @@
         return ascii;
     }
-
-    // FIXME: Check for U_BUFFER_OVERFLOW_ERROR and retry with an allocated buffer.
     return std::nullopt;
 }