Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Decode data URLs in web process
https://bugs.webkit.org/show_bug.cgi?id=148128 Reviewed by Darin Adler. Source/WebCore: We currenly send data URLs to networking layer for decoding. This involves a long and slow roundtrip through IPC and API layers. * WebCore.xcodeproj/project.pbxproj: * loader/ResourceLoadScheduler.cpp: (WebCore::ResourceLoadScheduler::maybeLoadQuickLookResource): Deleted. Remove this awkward interface for WebKit2. * loader/ResourceLoadScheduler.h: * loader/ResourceLoader.cpp: (WebCore::ResourceLoader::start): (WebCore::ResourceLoader::loadDataURL): Load using DataURLDecoder. * loader/ResourceLoader.h: Make start() public and export it so it can be called directly from WebKit2. * platform/network/DataURLDecoder.cpp: Added. (WebCore::DataURLDecoder::decodeQueue): (WebCore::DataURLDecoder::DecodeTask::DecodeTask): (WebCore::DataURLDecoder::createDecodeTask): Parse data URL metadata and initialize the decode task. (WebCore::DataURLDecoder::decodeBase64): (WebCore::DataURLDecoder::decodeEscaped): (WebCore::DataURLDecoder::decode): Asynchronously decode in a concurrent distpatch queue. * platform/network/DataURLDecoder.h: Added. * platform/network/ios/QuickLook.h: * platform/text/DecodeEscapeSequences.h: (WebCore::URLEscapeSequence::findEndOfRun): (WebCore::URLEscapeSequence::decodeRun): Factor buffer generation to a function. (WebCore::decodeEscapeSequences): (WebCore::decodeURLEscapeSequencesAsData): Add decode function that produces bytes instead of a String. Source/WebKit2: * WebProcess/Network/WebResourceLoadScheduler.cpp: (WebKit::WebResourceLoadScheduler::scheduleLoad): Don't send data: loads to the network process, handle them locally. (WebKit::WebResourceLoadScheduler::startLocalLoad): Call ResourceLoder::start() directly. Canonical link: https://commits.webkit.org/166454@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@188820 268f45cc-cd09-0410-ab3c-d52691b4dbfc
- Loading branch information
Showing
with
393 additions
and 38 deletions.
- +1 −0 Source/WebCore/CMakeLists.txt
- +52 −0 Source/WebCore/ChangeLog
- +2 −0 Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
- +8 −0 Source/WebCore/WebCore.xcodeproj/project.pbxproj
- +0 −11 Source/WebCore/loader/ResourceLoadScheduler.cpp
- +0 −4 Source/WebCore/loader/ResourceLoadScheduler.h
- +36 −3 Source/WebCore/loader/ResourceLoader.cpp
- +3 −6 Source/WebCore/loader/ResourceLoader.h
- +148 −0 Source/WebCore/platform/network/DataURLDecoder.cpp
- +55 −0 Source/WebCore/platform/network/DataURLDecoder.h
- +1 −1 Source/WebCore/platform/network/ios/QuickLook.h
- +55 −10 Source/WebCore/platform/text/DecodeEscapeSequences.h
- +16 −0 Source/WebKit2/ChangeLog
- +14 −2 Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp
- +2 −1 Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.h
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -0,0 +1,148 @@ | ||
| /* | ||
| * Copyright (C) 2015 Apple Inc. All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions | ||
| * are met: | ||
| * 1. Redistributions of source code must retain the above copyright | ||
| * notice, this list of conditions and the following disclaimer. | ||
| * 2. Redistributions in binary form must reproduce the above copyright | ||
| * notice, this list of conditions and the following disclaimer in the | ||
| * documentation and/or other materials provided with the distribution. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' | ||
| * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, | ||
| * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
| * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS | ||
| * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
| * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
| * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
| * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
| * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF | ||
| * THE POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
|
|
||
| #include "config.h" | ||
| #include "DataURLDecoder.h" | ||
|
|
||
| #include "DecodeEscapeSequences.h" | ||
| #include "HTTPParsers.h" | ||
| #include "SharedBuffer.h" | ||
| #include "URL.h" | ||
| #include <wtf/MainThread.h> | ||
| #include <wtf/RunLoop.h> | ||
| #include <wtf/WorkQueue.h> | ||
| #include <wtf/text/Base64.h> | ||
|
|
||
| namespace WebCore { | ||
| namespace DataURLDecoder { | ||
|
|
||
| static WorkQueue& decodeQueue() | ||
| { | ||
| static auto& queue = WorkQueue::create("org.webkit.DataURLDecoder").leakRef(); | ||
| return queue; | ||
| } | ||
|
|
||
| struct DecodeTask { | ||
| const String urlString; | ||
| const StringView encodedData; | ||
| const bool isBase64; | ||
| const DecodeCompletionHandler completionHandler; | ||
|
|
||
| Result result; | ||
| }; | ||
|
|
||
| static Result parseMediaType(const String& mediaType) | ||
| { | ||
| auto mimeType = extractMIMETypeFromMediaType(mediaType); | ||
| auto charset = extractCharsetFromMediaType(mediaType); | ||
|
|
||
| // https://tools.ietf.org/html/rfc2397 | ||
| // If <mediatype> is omitted, it defaults to text/plain;charset=US-ASCII. As a shorthand, | ||
| // "text/plain" can be omitted but the charset parameter supplied. | ||
| if (mimeType.isEmpty()) { | ||
| mimeType = ASCIILiteral("text/plain"); | ||
| if (charset.isEmpty()) | ||
| charset = ASCIILiteral("US-ASCII"); | ||
| } | ||
| return { mimeType, charset, nullptr }; | ||
| } | ||
|
|
||
| static std::unique_ptr<DecodeTask> createDecodeTask(const URL& url, DecodeCompletionHandler completionHandler) | ||
| { | ||
| const char dataString[] = "data:"; | ||
| const char base64String[] = ";base64"; | ||
|
|
||
| auto urlString = url.string(); | ||
| ASSERT(urlString.startsWith(dataString)); | ||
|
|
||
| size_t headerEnd = urlString.find(',', strlen(dataString)); | ||
| size_t encodedDataStart = headerEnd == notFound ? headerEnd : headerEnd + 1; | ||
|
|
||
| auto encodedData = StringView(urlString).substring(encodedDataStart); | ||
| auto header = StringView(urlString).substring(strlen(dataString), headerEnd - strlen(dataString)); | ||
| bool isBase64 = header.endsWithIgnoringASCIICase(StringView(base64String)); | ||
| auto mediaType = (isBase64 ? header.substring(0, header.length() - strlen(base64String)) : header).toString(); | ||
|
|
||
| return std::make_unique<DecodeTask>(DecodeTask { | ||
| WTF::move(urlString), | ||
| WTF::move(encodedData), | ||
| isBase64, | ||
| WTF::move(completionHandler), | ||
| parseMediaType(mediaType) | ||
| }); | ||
| } | ||
|
|
||
| static void decodeBase64(DecodeTask& task) | ||
| { | ||
| Vector<char> buffer; | ||
| // First try base64url. | ||
| if (!base64URLDecode(task.encodedData.toStringWithoutCopying(), buffer)) { | ||
| // Didn't work, try unescaping and decoding as base64. | ||
| auto unescapedString = decodeURLEscapeSequences(task.encodedData.toStringWithoutCopying()); | ||
| if (!base64Decode(unescapedString, buffer, Base64IgnoreWhitespace)) | ||
| return; | ||
| } | ||
| buffer.shrinkToFit(); | ||
| task.result.data = SharedBuffer::adoptVector(buffer); | ||
| } | ||
|
|
||
| static void decodeEscaped(DecodeTask& task) | ||
| { | ||
| TextEncoding encodingFromCharset(task.result.charset); | ||
| auto& encoding = encodingFromCharset.isValid() ? encodingFromCharset : UTF8Encoding(); | ||
| auto buffer = decodeURLEscapeSequencesAsData(task.encodedData, encoding); | ||
|
|
||
| buffer.shrinkToFit(); | ||
| task.result.data = SharedBuffer::adoptVector(buffer); | ||
| } | ||
|
|
||
| void decode(const URL& url, DecodeCompletionHandler completionHandler) | ||
| { | ||
| ASSERT(url.protocolIsData()); | ||
|
|
||
| auto decodeTask = createDecodeTask(url, WTF::move(completionHandler)); | ||
|
|
||
| auto* decodeTaskPtr = decodeTask.release(); | ||
| decodeQueue().dispatch([decodeTaskPtr] { | ||
| auto& decodeTask = *decodeTaskPtr; | ||
|
|
||
| if (decodeTask.isBase64) | ||
| decodeBase64(decodeTask); | ||
| else | ||
| decodeEscaped(decodeTask); | ||
|
|
||
| callOnMainThread([decodeTaskPtr] { | ||
| std::unique_ptr<DecodeTask> decodeTask(decodeTaskPtr); | ||
| if (!decodeTask->result.data) { | ||
| decodeTask->completionHandler({ }); | ||
| return; | ||
| } | ||
| decodeTask->completionHandler(WTF::move(decodeTask->result)); | ||
| }); | ||
| }); | ||
| } | ||
|
|
||
| } | ||
| } |
Oops, something went wrong.