Changeset 254672 in webkit

Timestamp:

Jan 16, 2020 4:13:17 AM (4 years ago)

Author:

commit-queue@webkit.org

Message:

Fetch: URL parser not always using UTF-8
​https://bugs.webkit.org/show_bug.cgi?id=178008

Patch by Rob Buis <​rbuis@igalia.com> on 2020-01-16
Reviewed by Youenn Fablet.

LayoutTests/imported/w3c:

Update improved test result.

• web-platform-tests/fetch/api/request/url-encoding-expected.txt:

Source/WebCore:

Make sure fetch requests run the URL parser with a UTF-8 decoder.

Test: web-platform-tests/fetch/api/request/url-encoding.html

• Modules/fetch/FetchRequest.cpp:

(WebCore::FetchRequest::initializeWith):

• dom/Document.cpp:

(WebCore::Document::completeURL const):

• dom/Document.h:
• dom/ScriptExecutionContext.h:
• workers/WorkerGlobalScope.cpp:

(WebCore::WorkerGlobalScope::completeURL const):

• workers/WorkerGlobalScope.h:
• worklets/WorkletGlobalScope.cpp:

(WebCore::WorkletGlobalScope::completeURL const):

• worklets/WorkletGlobalScope.h:

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/url-encoding-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/fetch/FetchRequest.cpp (modified) (1 diff)
• Source/WebCore/dom/Document.cpp (modified) (2 diffs)
• Source/WebCore/dom/Document.h (modified) (1 diff)
• Source/WebCore/dom/ScriptExecutionContext.h (modified) (1 diff)
• Source/WebCore/workers/WorkerGlobalScope.cpp (modified) (1 diff)
• Source/WebCore/workers/WorkerGlobalScope.h (modified) (1 diff)
• Source/WebCore/worklets/WorkletGlobalScope.cpp (modified) (1 diff)
• Source/WebCore/worklets/WorkletGlobalScope.h (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2020-01-16  Rob Buis  <rbuis@igalia.com>
+
+        Fetch: URL parser not always using UTF-8
+        https://bugs.webkit.org/show_bug.cgi?id=178008
+
+        Reviewed by Youenn Fablet.
+
+        Update improved test result.
+
+        * web-platform-tests/fetch/api/request/url-encoding-expected.txt:
+
 2020-01-16  Cathie Chen  <cathiechen@igalia.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/url-encoding-expected.txt

@@ -1 +1 @@
 
-FAIL URL encoding and Request assert_equals: expected "http://localhost:8800/fetch/api/request/url-encoding.html?%C3%9F" but got "http://localhost:8800/fetch/api/request/url-encoding.html?%DF"
-FAIL URL encoding and fetch() assert_equals: expected "http://localhost:8800/fetch/api/request/url-encoding.html?%C3%9F" but got "http://localhost:8800/fetch/api/request/url-encoding.html?%DF"
+PASS URL encoding and Request 
+PASS URL encoding and fetch() 
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-01-16  Rob Buis  <rbuis@igalia.com>
+
+        Fetch: URL parser not always using UTF-8
+        https://bugs.webkit.org/show_bug.cgi?id=178008
+
+        Reviewed by Youenn Fablet.
+
+        Make sure fetch requests run the URL parser with a UTF-8 decoder.
+
+        Test: web-platform-tests/fetch/api/request/url-encoding.html
+
+        * Modules/fetch/FetchRequest.cpp:
+        (WebCore::FetchRequest::initializeWith):
+        * dom/Document.cpp:
+        (WebCore::Document::completeURL const):
+        * dom/Document.h:
+        * dom/ScriptExecutionContext.h:
+        * workers/WorkerGlobalScope.cpp:
+        (WebCore::WorkerGlobalScope::completeURL const):
+        * workers/WorkerGlobalScope.h:
+        * worklets/WorkletGlobalScope.cpp:
+        (WebCore::WorkletGlobalScope::completeURL const):
+        * worklets/WorkletGlobalScope.h:
+
 2020-01-16  Alicia Boya García  <aboya@igalia.com>
 

trunk/Source/WebCore/Modules/fetch/FetchRequest.cpp

@@ -162 +162 @@
     ASSERT(scriptExecutionContext());
     // FIXME: Tighten the URL parsing algorithm according https://url.spec.whatwg.org/#concept-url-parser.
-    URL requestURL = scriptExecutionContext()->completeURL(url);
+    URL requestURL = scriptExecutionContext()->completeURL(url, ScriptExecutionContext::ForceUTF8::Yes);
     if (!requestURL.isValid() || !requestURL.user().isEmpty() || !requestURL.pass().isEmpty())
         return Exception { TypeError, "URL is not valid or contains user credentials."_s };

trunk/Source/WebCore/dom/Document.cpp

@@ -5206 +5206 @@
 }
 
-URL Document::completeURL(const String& url, const URL& baseURLOverride) const
+URL Document::completeURL(const String& url, const URL& baseURLOverride, ForceUTF8 forceUTF8) const
 {
     // Always return a null URL when passed a null string.
@@ -5214 +5214 @@
         return URL();
     const URL& baseURL = ((baseURLOverride.isEmpty() || baseURLOverride == WTF::blankURL()) && parentDocument()) ? parentDocument()->baseURL() : baseURLOverride;
-    if (!m_decoder)
+    if (!m_decoder || forceUTF8 == ForceUTF8::Yes)
         return URL(baseURL, url);
     return URL(baseURL, url, m_decoder->encodingForURLParsing());
 }
 
-URL Document::completeURL(const String& url) const
-{
-    return completeURL(url, m_baseURL);
+URL Document::completeURL(const String& url, ForceUTF8 forceUTF8) const
+{
+    return completeURL(url, m_baseURL, forceUTF8);
 }
 

trunk/Source/WebCore/dom/Document.h

@@ -688 +688 @@
     void processBaseElement();
 
-    WEBCORE_EXPORT URL completeURL(const String&) const final;
-    URL completeURL(const String&, const URL& baseURLOverride) const;
+    WEBCORE_EXPORT URL completeURL(const String&, ForceUTF8 = ForceUTF8::No) const final;
+    URL completeURL(const String&, const URL& baseURLOverride, ForceUTF8 = ForceUTF8::No) const;
 
     String userAgent(const URL&) const final;

trunk/Source/WebCore/dom/ScriptExecutionContext.h

@@ -95 +95 @@
 
     virtual const URL& url() const = 0;
-    virtual URL completeURL(const String& url) const = 0;
+    enum class ForceUTF8 { No, Yes };
+    virtual URL completeURL(const String& url, ForceUTF8 = ForceUTF8::No) const = 0;
 
     virtual String userAgent(const URL&) const = 0;

trunk/Source/WebCore/workers/WorkerGlobalScope.cpp

@@ -168 +168 @@
 }
 
-URL WorkerGlobalScope::completeURL(const String& url) const
+URL WorkerGlobalScope::completeURL(const String& url, ForceUTF8) const
 {
     // Always return a null URL when passed a null string.

trunk/Source/WebCore/workers/WorkerGlobalScope.h

@@ -161 +161 @@
 
     ScriptExecutionContext* scriptExecutionContext() const final { return const_cast<WorkerGlobalScope*>(this); }
-    URL completeURL(const String&) const final;
+    URL completeURL(const String&, ForceUTF8 = ForceUTF8::No) const final;
     String userAgent(const URL&) const final;
     void disableEval(const String& errorMessage) final;

trunk/Source/WebCore/worklets/WorkletGlobalScope.cpp

@@ -132 +132 @@
 }
 
-URL WorkletGlobalScope::completeURL(const String& url) const
+URL WorkletGlobalScope::completeURL(const String& url, ForceUTF8) const
 {
     if (url.isNull())

trunk/Source/WebCore/worklets/WorkletGlobalScope.h

@@ -121 +121 @@
     bool unwrapCryptoKey(const Vector<uint8_t>&, Vector<uint8_t>&) final { RELEASE_ASSERT_NOT_REACHED(); return false; }
 #endif
-    URL completeURL(const String&) const final;
+    URL completeURL(const String&, ForceUTF8 = ForceUTF8::No) const final;
     String userAgent(const URL&) const final;
     void disableEval(const String&) final;