<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[204701] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/204701">204701</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-21 22:42:12 -0700 (Sun, 21 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>URLParser should parse IPv4 addresses
https://bugs.webkit.org/show_bug.cgi?id=161023
Patch by Alex Christensen <achristensen@webkit.org> on 2016-08-21
Reviewed by Darin Adler.
Source/WebCore:
Covered by new API tests because URLParser isn't used anywhere in WebCore yet.
* platform/URLParser.cpp:
(WebCore::URLParser::authorityEndReached):
(WebCore::serializeIPv4):
(WebCore::parseIPv4Number):
(WebCore::pow256):
(WebCore::parseIPv4Host):
(WebCore::parseIPv6Host):
(WebCore::URLParser::hostEndReached):
Tools:
* TestWebKitAPI/Tests/WebCore/URLParser.cpp:
(TestWebKitAPI::TEST_F):
(TestWebKitAPI::checkURLDifferences):
We are already getting differences between the old URL::parse and the new URLParser.
(TestWebKitAPI::shouldFail):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformURLParsercpp">trunk/Source/WebCore/platform/URLParser.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebCoreURLParsercpp">trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204700 => 204701)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-22 04:04:54 UTC (rev 204700)
+++ trunk/Source/WebCore/ChangeLog 2016-08-22 05:42:12 UTC (rev 204701)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-08-21 Alex Christensen <achristensen@webkit.org>
+
+ URLParser should parse IPv4 addresses
+ https://bugs.webkit.org/show_bug.cgi?id=161023
+
+ Reviewed by Darin Adler.
+
+ Covered by new API tests because URLParser isn't used anywhere in WebCore yet.
+
+ * platform/URLParser.cpp:
+ (WebCore::URLParser::authorityEndReached):
+ (WebCore::serializeIPv4):
+ (WebCore::parseIPv4Number):
+ (WebCore::pow256):
+ (WebCore::parseIPv4Host):
+ (WebCore::parseIPv6Host):
+ (WebCore::URLParser::hostEndReached):
+
</ins><span class="cx"> 2016-08-21 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove a few custom bindings
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URLParser.cpp (204700 => 204701)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URLParser.cpp 2016-08-22 04:04:54 UTC (rev 204700)
+++ trunk/Source/WebCore/platform/URLParser.cpp 2016-08-22 05:42:12 UTC (rev 204701)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "NotImplemented.h"
</span><ins>+#include <array>
</ins><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -394,11 +395,139 @@
</span><span class="cx"> m_authorityOrHostBuffer.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void serializeIPv4(uint32_t address, StringBuilder& buffer)
+{
+ buffer.appendNumber(address >> 24);
+ buffer.append('.');
+ buffer.appendNumber((address >> 16) & 0xFF);
+ buffer.append('.');
+ buffer.appendNumber((address >> 8) & 0xFF);
+ buffer.append('.');
+ buffer.appendNumber(address & 0xFF);
+}
+
+static Optional<uint32_t> parseIPv4Number(StringView::CodePoints::Iterator& iterator, const StringView::CodePoints::Iterator& end)
+{
+ // FIXME: Check for overflow.
+ enum class State : uint8_t {
+ UnknownBase,
+ Decimal,
+ OctalOrHex,
+ Octal,
+ Hex,
+ };
+ State state = State::UnknownBase;
+ uint32_t value = 0;
+ while (iterator != end) {
+ if (*iterator == '.') {
+ ++iterator;
+ return value;
+ }
+ switch (state) {
+ case State::UnknownBase:
+ if (*iterator == '0') {
+ ++iterator;
+ state = State::OctalOrHex;
+ break;
+ }
+ state = State::Decimal;
+ break;
+ case State::OctalOrHex:
+ if (*iterator == 'x' || *iterator == 'X') {
+ ++iterator;
+ state = State::Hex;
+ break;
+ }
+ state = State::Octal;
+ break;
+ case State::Decimal:
+ if (*iterator < '0' || *iterator > '9')
+ return Nullopt;
+ value *= 10;
+ value += *iterator - '0';
+ ++iterator;
+ break;
+ case State::Octal:
+ if (*iterator < '0' || *iterator > '7')
+ return Nullopt;
+ value *= 8;
+ value += *iterator - '0';
+ ++iterator;
+ break;
+ case State::Hex:
+ if (!isASCIIHexDigit(*iterator))
+ return Nullopt;
+ value *= 16;
+ value += toASCIIHexValue(*iterator);
+ ++iterator;
+ break;
+ }
+ }
+ return value;
+}
+
+static uint64_t pow256(size_t exponent)
+{
+ RELEASE_ASSERT(exponent <= 4);
+ uint64_t values[5] = {1, 256, 256 * 256, 256 * 256 * 256, 256ull * 256 * 256 * 256 };
+ return values[exponent];
+}
+
+static Optional<uint32_t> parseIPv4Host(StringView::CodePoints::Iterator iterator, const StringView::CodePoints::Iterator& end)
+{
+ Vector<uint32_t, 4> items;
+ items.reserveInitialCapacity(4);
+ while (iterator != end) {
+ if (items.size() >= 4)
+ return Nullopt;
+ if (auto item = parseIPv4Number(iterator, end))
+ items.append(item.value());
+ else
+ return Nullopt;
+ }
+ if (!items.size() || items.size() > 4)
+ return Nullopt;
+ for (size_t i = 0; i < items.size() - 2; i++) {
+ if (items[i] > 255)
+ return Nullopt;
+ }
+ if (items[items.size() - 1] >= pow256(5 - items.size()))
+ return Nullopt;
+ for (auto item : items) {
+ if (item > 255)
+ return Nullopt;
+ }
+ uint32_t ipv4 = items.takeLast();
+ for (size_t counter = 0; counter < items.size(); ++counter)
+ ipv4 += items[counter] * pow256(3 - counter);
+ return ipv4;
+}
+
+static Optional<std::array<uint16_t, 8>> parseIPv6Host(StringView::CodePoints::Iterator, StringView::CodePoints::Iterator)
+{
+ notImplemented();
+ return Nullopt;
+}
+
</ins><span class="cx"> void URLParser::hostEndReached()
</span><span class="cx"> {
</span><span class="cx"> auto codePoints = StringView(m_authorityOrHostBuffer.toString()).codePoints();
</span><span class="cx"> auto iterator = codePoints.begin();
</span><span class="cx"> auto end = codePoints.end();
</span><ins>+ if (iterator == end)
+ return;
+ if (*iterator == '[') {
+ ++iterator;
+ parseIPv6Host(iterator, end);
+ return;
+ }
+ if (auto address = parseIPv4Host(iterator, end)) {
+ serializeIPv4(address.value(), m_buffer);
+ m_url.m_hostEnd = m_buffer.length();
+ // FIXME: Handle the port correctly.
+ m_url.m_portEnd = m_buffer.length();
+ return;
+ }
</ins><span class="cx"> for (; iterator != end; ++iterator) {
</span><span class="cx"> if (*iterator == ':') {
</span><span class="cx"> ++iterator;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (204700 => 204701)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-08-22 04:04:54 UTC (rev 204700)
+++ trunk/Tools/ChangeLog 2016-08-22 05:42:12 UTC (rev 204701)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-08-21 Alex Christensen <achristensen@webkit.org>
+
+ URLParser should parse IPv4 addresses
+ https://bugs.webkit.org/show_bug.cgi?id=161023
+
+ Reviewed by Darin Adler.
+
+ * TestWebKitAPI/Tests/WebCore/URLParser.cpp:
+ (TestWebKitAPI::TEST_F):
+ (TestWebKitAPI::checkURLDifferences):
+ We are already getting differences between the old URL::parse and the new URLParser.
+ (TestWebKitAPI::shouldFail):
+
</ins><span class="cx"> 2016-08-21 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> prepare-ChangeLog lists unmodified functions as modified and marks functions with few changes as deleted
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp (204700 => 204701)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp 2016-08-22 04:04:54 UTC (rev 204700)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp 2016-08-22 05:42:12 UTC (rev 204701)
</span><span class="lines">@@ -88,8 +88,47 @@
</span><span class="cx"> checkURL("http://user:pass@webkit.org:123", {"http", "user", "pass", "webkit.org", 123, "/", "", "", "http://user:pass@webkit.org:123/"});
</span><span class="cx"> checkURL("http://user:pass@webkit.org", {"http", "user", "pass", "webkit.org", 0, "/", "", "", "http://user:pass@webkit.org/"});
</span><span class="cx"> checkURL("http://webkit.org", {"http", "", "", "webkit.org", 0, "/", "", "", "http://webkit.org/"});
</span><ins>+ checkURL("http://127.0.0.1", {"http", "", "", "127.0.0.1", 0, "/", "", "", "http://127.0.0.1/"});
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+static void checkURLDifferences(const String& urlString, const ExpectedParts& partsNew, const ExpectedParts& partsOld)
+{
+ URLParser parser;
+ auto url = parser.parse(urlString);
+ EXPECT_STREQ(s(partsNew.protocol), s(url->protocol()));
+ EXPECT_STREQ(s(partsNew.user), s(url->user()));
+ EXPECT_STREQ(s(partsNew.password), s(url->pass()));
+ EXPECT_STREQ(s(partsNew.host), s(url->host()));
+ EXPECT_EQ(partsNew.port, url->port());
+ EXPECT_STREQ(s(partsNew.path), s(url->path()));
+ EXPECT_STREQ(s(partsNew.query), s(url->query()));
+ EXPECT_STREQ(s(partsNew.fragment), s(url->fragmentIdentifier()));
+ EXPECT_STREQ(s(partsNew.string), s(url->string()));
+
+ auto oldURL = URL(URL(), urlString);
+ EXPECT_STREQ(s(partsOld.protocol), s(oldURL.protocol()));
+ EXPECT_STREQ(s(partsOld.user), s(oldURL.user()));
+ EXPECT_STREQ(s(partsOld.password), s(oldURL.pass()));
+ EXPECT_STREQ(s(partsOld.host), s(oldURL.host()));
+ EXPECT_EQ(partsOld.port, oldURL.port());
+ EXPECT_STREQ(s(partsOld.path), s(oldURL.path()));
+ EXPECT_STREQ(s(partsOld.query), s(oldURL.query()));
+ EXPECT_STREQ(s(partsOld.fragment), s(oldURL.fragmentIdentifier()));
+ EXPECT_STREQ(s(partsOld.string), s(oldURL.string()));
+
+ EXPECT_FALSE(URLParser::allValuesEqual(url.value(), oldURL));
+}
+
+TEST_F(URLParserTest, ParserDifferences)
+{
+ 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://011.11.0X11.0x011",
+ {"http", "", "", "9.11.17.17", 0, "/", "", "", "http://9.11.17.17/"},
+ {"http", "", "", "011.11.0x11.0x011", 0, "/", "", "", "http://011.11.0x11.0x011/"});
+}
+
</ins><span class="cx"> static void shouldFail(const String& urlString)
</span><span class="cx"> {
</span><span class="cx"> URLParser parser;
</span></span></pre>
</div>
</div>
</body>
</html>