Changeset 208086 in webkit

Timestamp:

Oct 28, 2016, 5:17:01 PM (9 years ago)

Author:

achristensen@apple.com

Message:

URLParser should not try to interpret host of URLs with unrecognized schemes as IPv4 address
​https://bugs.webkit.org/show_bug.cgi?id=164154

Reviewed by Andy Estes.

Source/WebCore:

This is needed to match behavior of all browsers.
This is being discussed in the spec at ​https://github.com/whatwg/url/issues/148

Covered by new API tests.

• platform/URLParser.cpp:

(WebCore::URLParser::parseHostAndPort):
Only try to parse and canonicalize the host as an IPv4 address if the scheme is special (http, wss, etc.)

Tools:

• TestWebKitAPI/Tests/WebCore/URLParser.cpp:

(TestWebKitAPI::TEST_F):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/URLParser.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-28  Alex Christensen  <achristensen@webkit.org>
+
+        URLParser should not try to interpret host of URLs with unrecognized schemes as IPv4 address
+        https://bugs.webkit.org/show_bug.cgi?id=164154
+
+        Reviewed by Andy Estes.
+
+        This is needed to match behavior of all browsers.
+        This is being discussed in the spec at https://github.com/whatwg/url/issues/148
+
+        Covered by new API tests.
+
+        * platform/URLParser.cpp:
+        (WebCore::URLParser::parseHostAndPort):
+        Only try to parse and canonicalize the host as an IPv4 address if the scheme is special (http, wss, etc.)
+
 2016-10-28  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/platform/URLParser.cpp

@@ -2573 +2573 @@
                 return false;
         }
-        if (auto address = parseIPv4Host(CodePointIterator<CharacterType>(hostIterator, iterator))) {
-            serializeIPv4(address.value());
-            m_url.m_hostEnd = currentPosition(iterator);
-            if (iterator.atEnd()) {
-                m_url.m_portEnd = currentPosition(iterator);
-                return true;
-            }
-            return parsePort(iterator);
+        if (m_urlIsSpecial) {
+            if (auto address = parseIPv4Host(CodePointIterator<CharacterType>(hostIterator, iterator))) {
+                serializeIPv4(address.value());
+                m_url.m_hostEnd = currentPosition(iterator);
+                if (iterator.atEnd()) {
+                    m_url.m_portEnd = currentPosition(iterator);
+                    return true;
+                }
+                return parsePort(iterator);
+            }
         }
         for (; hostIterator != iterator; ++hostIterator) {
-            if (LIKELY(!isTabOrNewline(*hostIterator))) {
-                if (m_urlIsSpecial) {
-                    if (UNLIKELY(isASCIIUpper(*hostIterator)))
-                        syntaxViolation(hostIterator);
-                    appendToASCIIBuffer(toASCIILower(*hostIterator));
-                } else
-                    appendToASCIIBuffer(*hostIterator);
+            if (UNLIKELY(isTabOrNewline(*hostIterator))) {
+                syntaxViolation(hostIterator);
+                continue;
+            }
+            if (m_urlIsSpecial) {
+                if (UNLIKELY(isASCIIUpper(*hostIterator)))
+                    syntaxViolation(hostIterator);
+                appendToASCIIBuffer(toASCIILower(*hostIterator));
             } else
-                syntaxViolation(hostIterator);
+                appendToASCIIBuffer(*hostIterator);
         }
         m_url.m_hostEnd = currentPosition(iterator);

trunk/Tools/ChangeLog

@@ +1 @@
+2016-10-28  Alex Christensen  <achristensen@webkit.org>
+
+        URLParser should not try to interpret host of URLs with unrecognized schemes as IPv4 address
+        https://bugs.webkit.org/show_bug.cgi?id=164154
+
+        Reviewed by Andy Estes.
+
+        * TestWebKitAPI/Tests/WebCore/URLParser.cpp:
+        (TestWebKitAPI::TEST_F):
+
 2016-10-28  Sam Weinig  <sam@webkit.org>
 

trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp

@@ -950 +950 @@
         {"", "", "", "", 0, "", "", "", "http://[a:b:c:d:e:f::127.0.0.256]"},
         {"http", "", "", "[a:b:c:d:e:f::127.0.0.256]", 0, "/", "", "", "http://[a:b:c:d:e:f::127.0.0.256]/"});
+    checkURLDifferences("http://123456", {"http", "", "", "0.1.226.64", 0, "/", "", "", "http://0.1.226.64/"}, {"http", "", "", "123456", 0, "/", "", "", "http://123456/"});
+    checkURL("asdf://123456", {"asdf", "", "", "123456", 0, "", "", "", "asdf://123456"});
+    checkURLDifferences("http://[0:0:0:0:a:b:c:d]",
+        {"http", "", "", "[::a:b:c:d]", 0, "/", "", "", "http://[::a:b:c:d]/"},
+        {"http", "", "", "[0:0:0:0:a:b:c:d]", 0, "/", "", "", "http://[0:0:0:0:a:b:c:d]/"});
+    checkURLDifferences("asdf://[0:0:0:0:a:b:c:d]",
+        {"asdf", "", "", "[::a:b:c:d]", 0, "", "", "", "asdf://[::a:b:c:d]"},
+        {"asdf", "", "", "[0:0:0:0:a:b:c:d]", 0, "", "", "", "asdf://[0:0:0:0:a:b:c:d]"});
 }
 
@@ -1106 +1114 @@
     shouldFail("http://[a:b:c:d:e:f:127.0.-0.1]");
     shouldFail("asdf://space InHost");
+    shouldFail("asdf://[0:0:0:0:a:b:c:d");
 }