Changeset 206609 in webkit

Timestamp:

Sep 29, 2016, 1:21:54 PM (9 years ago)

Author:

achristensen@apple.com

Message:

URLParser: make parsing invalid IPv4 addresses more robust and correct
​https://bugs.webkit.org/show_bug.cgi?id=162746

Reviewed by Tim Horton.

Source/WebCore:

If parsing an IPv4 address fails, the characters are just treated as a regular domain.

Covered by new API tests.

• platform/URLParser.cpp:

(WebCore::URLParser::parseIPv4Number):
(WebCore::URLParser::parseIPv4Host):

Tools:

• TestWebKitAPI/Tests/WebCore/URLParser.cpp:

(TestWebKitAPI::TEST_F):

Location:

trunk

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-29  Alex Christensen  <achristensen@webkit.org>
+
+        URLParser: make parsing invalid IPv4 addresses more robust and correct
+        https://bugs.webkit.org/show_bug.cgi?id=162746
+
+        Reviewed by Tim Horton.
+
+        If parsing an IPv4 address fails, the characters are just treated as a regular domain.
+
+        Covered by new API tests.
+
+        * platform/URLParser.cpp:
+        (WebCore::URLParser::parseIPv4Number):
+        (WebCore::URLParser::parseIPv4Host):
+
 2016-09-29  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/platform/URLParser.cpp

@@ -2044 +2044 @@
     while (!iterator.atEnd()) {
         if (*iterator == '.') {
-            ++iterator;
             ASSERT(!value.hasOverflowed());
             return value.unsafeGet();
@@ -2124 +2123 @@
         else
             return Nullopt;
-    }
-    if (!items.size() || items.size() > 4)
+        if (!iterator.atEnd()) {
+            if (items.size() >= 4)
+                return Nullopt;
+            if (*iterator == '.')
+                ++iterator;
+            else
+                return Nullopt;
+        }
+    }
+    if (!iterator.atEnd() || !items.size() || items.size() > 4)
         return Nullopt;
     if (items.size() > 2) {

trunk/Tools/ChangeLog

@@ +1 @@
+2016-09-29  Alex Christensen  <achristensen@webkit.org>
+
+        URLParser: make parsing invalid IPv4 addresses more robust and correct
+        https://bugs.webkit.org/show_bug.cgi?id=162746
+
+        Reviewed by Tim Horton.
+
+        * TestWebKitAPI/Tests/WebCore/URLParser.cpp:
+        (TestWebKitAPI::TEST_F):
+
 2016-09-29  Alex Christensen  <achristensen@webkit.org>
 

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

@@ -290 +290 @@
     checkURL("http://\t//\\///user:@webkit.org:99?foo", {"http", "user", "", "webkit.org", 99, "/", "foo", "", "http://user@webkit.org:99/?foo"});
     checkURL("http:/\\user:@webkit.org:99?foo", {"http", "user", "", "webkit.org", 99, "/", "foo", "", "http://user@webkit.org:99/?foo"});
+    checkURL("http://127.0.0.1", {"http", "", "", "127.0.0.1", 0, "/", "", "", "http://127.0.0.1/"});
+    checkURL("http://127.0.0.1.", {"http", "", "", "127.0.0.1.", 0, "/", "", "", "http://127.0.0.1./"});
+    checkURL("http://127.0.0.1./", {"http", "", "", "127.0.0.1.", 0, "/", "", "", "http://127.0.0.1./"});
 
     // This disagrees with the web platform test for http://:@www.example.com but agrees with Chrome and URL::parse,
@@ -749 +752 @@
         {"", "", "", "", 0, "", "", "", "http://[1:2:3:4:5:6:7:::]/"},
         {"http", "", "", "[1:2:3:4:5:6:7:::]", 0, "/", "", "", "http://[1:2:3:4:5:6:7:::]/"});
+    checkURLDifferences("http://127.0.0.1~/",
+        {"http", "", "", "127.0.0.1~", 0, "/", "", "", "http://127.0.0.1~/"},
+        {"", "", "", "", 0, "", "", "", "http://127.0.0.1~/"});
+    checkURLDifferences("http://127.0.1~/",
+        {"http", "", "", "127.0.1~", 0, "/", "", "", "http://127.0.1~/"},
+        {"", "", "", "", 0, "", "", "", "http://127.0.1~/"});
+    checkURLDifferences("http://127.0.1./",
+        {"http", "", "", "127.0.0.1", 0, "/", "", "", "http://127.0.0.1/"},
+        {"http", "", "", "127.0.1.", 0, "/", "", "", "http://127.0.1./"});
+    checkURLDifferences("http://127.0.1.~/",
+        {"http", "", "", "127.0.1.~", 0, "/", "", "", "http://127.0.1.~/"},
+        {"", "", "", "", 0, "", "", "", "http://127.0.1.~/"});
+    checkURLDifferences("http://127.0.1.~",
+        {"http", "", "", "127.0.1.~", 0, "/", "", "", "http://127.0.1.~/"},
+        {"", "", "", "", 0, "", "", "", "http://127.0.1.~"});
 }