Changeset 272138 in webkit

Timestamp:

Feb 1, 2021, 2:29:36 AM (6 years ago)

Author:

Carlos Garcia Campos

Message:

[SOUP] Add support for data URLs in the network process
​https://bugs.webkit.org/show_bug.cgi?id=221127

Reviewed by Adrian Perez de Castro.

In r271879 I removed the support for data URLs in the network process for soup, assuming data URLs were always
loaded from the web process, but that's not the case for downloads. I think we should not go to the network
process for downloads either, but for now it's easier to fix this regression by supporting data URLs in the
network process again. Fixes http/tests/security/anchor-download-allow-data.html.

• NetworkProcess/soup/NetworkDataTaskSoup.cpp:

(WebKit::NetworkDataTaskSoup::createRequest): Return early if it's a data URL.
(WebKit::NetworkDataTaskSoup::clearRequest): Clear the pending data URL result.
(WebKit::NetworkDataTaskSoup::resume): Start a data URL decode task if it's a new data URL request, or complete
the pending one.
(WebKit::NetworkDataTaskSoup::didReadDataURL): Complete the data URL request.

• NetworkProcess/soup/NetworkDataTaskSoup.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/soup/NetworkDataTaskSoup.cpp (modified) (5 diffs)
• NetworkProcess/soup/NetworkDataTaskSoup.h (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-02-01  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [SOUP] Add support for data URLs in the network process
+        https://bugs.webkit.org/show_bug.cgi?id=221127
+
+        Reviewed by Adrian Perez de Castro.
+
+        In r271879 I removed the support for data URLs in the network process for soup, assuming data URLs were always
+        loaded from the web process, but that's not the case for downloads. I think we should not go to the network
+        process for downloads either, but for now it's easier to fix this regression by supporting data URLs in the
+        network process again. Fixes http/tests/security/anchor-download-allow-data.html.
+
+        * NetworkProcess/soup/NetworkDataTaskSoup.cpp:
+        (WebKit::NetworkDataTaskSoup::createRequest): Return early if it's a data URL.
+        (WebKit::NetworkDataTaskSoup::clearRequest): Clear the pending data URL result.
+        (WebKit::NetworkDataTaskSoup::resume): Start a data URL decode task if it's a new data URL request, or complete
+        the pending one.
+        (WebKit::NetworkDataTaskSoup::didReadDataURL): Complete the data URL request.
+        * NetworkProcess/soup/NetworkDataTaskSoup.h:
+
 2021-01-29  Darin Adler  <darin@apple.com>
 

trunk/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp

@@ -114 +114 @@
     }
 
+    if (m_currentRequest.url().protocolIsData())
+        return;
+
     if (!m_currentRequest.url().protocolIsInHTTPFamily()) {
         scheduleFailure(InvalidURLFailure);
@@ -192 +195 @@
     stopTimeout();
     m_pendingResult = nullptr;
+    m_pendingDataURLResult = WTF::nullopt;
     m_file = nullptr;
     m_inputStream = nullptr;
@@ -239 +243 @@
         g_file_query_info_async(m_file.get(), G_FILE_ATTRIBUTE_STANDARD_TYPE "," G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE "," G_FILE_ATTRIBUTE_STANDARD_SIZE,
             G_FILE_QUERY_INFO_NONE, RunLoopSourcePriority::AsyncIONetwork, m_cancellable.get(), reinterpret_cast<GAsyncReadyCallback>(fileQueryInfoCallback), protectedThis.leakRef());
+        return;
+    }
+
+    if (m_currentRequest.url().protocolIsData() && !m_cancellable) {
+        m_cancellable = adoptGRef(g_cancellable_new());
+        DataURLDecoder::decode(m_currentRequest.url(), { }, DataURLDecoder::Mode::Legacy, [this, protectedThis = WTFMove(protectedThis)](auto decodeResult) mutable {
+            if (m_state == State::Canceling || m_state == State::Completed || !m_client) {
+                clearRequest();
+                return;
+            }
+
+            if (m_state == State::Suspended) {
+                m_pendingDataURLResult = WTFMove(decodeResult);
+                return;
+            }
+
+            didReadDataURL(WTFMove(decodeResult));
+        });
         return;
     }
@@ -258 +280 @@
         } else
             ASSERT_NOT_REACHED();
-    }
+    } else if (m_currentRequest.url().protocolIsData())
+        didReadDataURL(WTFMove(m_pendingDataURLResult));
 }
 
@@ -1298 +1321 @@
 }
 
+void NetworkDataTaskSoup::didReadDataURL(Optional<DataURLDecoder::Result>&& result)
+{
+    if (g_cancellable_is_cancelled(m_cancellable.get())) {
+        didFail(cancelledError(m_currentRequest));
+        return;
+    }
+
+    if (!result) {
+        didFail(internalError(m_currentRequest.url()));
+        return;
+    }
+
+    m_response = ResourceResponse::dataURLResponse(m_currentRequest.url(), result.value());
+    auto bytes = SharedBuffer::create(WTFMove(result->data))->createGBytes();
+    m_inputStream = adoptGRef(g_memory_input_stream_new_from_bytes(bytes.get()));
+    dispatchDidReceiveResponse();
+}
+
 } // namespace WebKit
 

trunk/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.h

@@ -27 +27 @@
 
 #include "NetworkDataTask.h"
+#include <WebCore/DataURLDecoder.h>
 #include <WebCore/FrameIdentifier.h>
 #include <WebCore/NetworkLoadMetrics.h>
@@ -143 +144 @@
     void didReadFile(GRefPtr<GInputStream>&&);
 
+    void didReadDataURL(Optional<WebCore::DataURLDecoder::Result>&&);
+
     WebCore::FrameIdentifier m_frameID;
     WebCore::PageIdentifier m_pageID;
@@ -153 +156 @@
     GRefPtr<GCancellable> m_cancellable;
     GRefPtr<GAsyncResult> m_pendingResult;
+    Optional<WebCore::DataURLDecoder::Result> m_pendingDataURLResult;
     WebCore::ProtectionSpace m_protectionSpaceForPersistentStorage;
     WebCore::Credential m_credentialForPersistentStorage;