Changeset 206159 in webkit

Timestamp:

Sep 20, 2016 11:34:19 AM (8 years ago)

Author:

achristensen@apple.com

Message:

URLParser should allow '@' in user
​https://bugs.webkit.org/show_bug.cgi?id=162272

Reviewed by Tim Horton.

Source/WebCore:

Covered by a new API test.

• platform/URLParser.cpp:

(WebCore::URLParser::parse):
The spec describes using an "@ flag" and rewinding iterators. I've implemented the authority parsing
and host parsing a little differently, but this makes it equivalent.

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) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-20  Alex Christensen  <achristensen@webkit.org>
+
+        URLParser should allow '@' in user
+        https://bugs.webkit.org/show_bug.cgi?id=162272
+
+        Reviewed by Tim Horton.
+
+        Covered by a new API test.
+
+        * platform/URLParser.cpp:
+        (WebCore::URLParser::parse):
+        The spec describes using an "@ flag" and rewinding iterators.  I've implemented the authority parsing
+        and host parsing a little differently, but this makes it equivalent.
+
 2016-09-20  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/platform/URLParser.cpp

@@ -1144 +1144 @@
             {
                 if (*c == '@') {
-                    parseAuthority<serialized>(CodePointIterator<CharacterType>(authorityOrHostBegin, c));
+                    auto lastAt = c;
+                    auto findLastAt = c;
+                    while (!findLastAt.atEnd()) {
+                        if (*findLastAt == '@')
+                            lastAt = findLastAt;
+                        ++findLastAt;
+                    }
+                    parseAuthority<serialized>(CodePointIterator<CharacterType>(authorityOrHostBegin, lastAt));
+                    c = lastAt;
                     incrementIteratorSkippingTabAndNewLine<serialized>(c);
                     authorityOrHostBegin = c;

trunk/Tools/ChangeLog

@@ +1 @@
+2016-09-20  Alex Christensen  <achristensen@webkit.org>
+
+        URLParser should allow '@' in user
+        https://bugs.webkit.org/show_bug.cgi?id=162272
+
+        Reviewed by Tim Horton.
+
+        * TestWebKitAPI/Tests/WebCore/URLParser.cpp:
+        (TestWebKitAPI::TEST_F):
+
 2016-09-20  Alex Christensen  <achristensen@webkit.org>
 

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

@@ -545 +545 @@
         {"file", "", "", "", 0, "/C:/foo/bar", "", "", "file:///C:/foo/bar"},
         {"file", "", "", "", 0, "/C|/foo/bar", "", "", "file:///C|/foo/bar"});
+    checkRelativeURLDifferences("https://@test@test@example:800/", "http://doesnotmatter/",
+        {"https", "@test@test", "", "example", 800, "/", "", "", "https://%40test%40test@example:800/"},
+        {"", "", "", "", 0, "", "", "", "https://@test@test@example:800/"});
 }