commit | a4b6b05204e4460dba71f1d3e7dff475bb811384 | [log] [tgz] |
---|---|---|
author | wenson_hsieh@apple.com <wenson_hsieh@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> | Fri Feb 09 23:41:34 2018 +0000 |
committer | wenson_hsieh@apple.com <wenson_hsieh@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> | Fri Feb 09 23:41:34 2018 +0000 |
tree | a2f1433c631070901a608aa68b54fe8c1a187e85 | |
parent | c669aaa216cdf8caa81c797c0b1ac7f10c860ba6 [diff] |
Pasting from Excel no longer provides text/html data https://bugs.webkit.org/show_bug.cgi?id=182636 <rdar://problem/37087060> Reviewed by Ryosuke Niwa. Source/WebCore: After r222656, we treat images on the pasteboard as files. However, we also have an existing policy which hides text data ("text/uri-list", "text/html", "text/plain") from the page when files are present on the pasteboard. When copying a table, Microsoft Excel writes a rendering of the table to the pasteboard as an image. This means that we'll hide other data types (importantly, 'text/html') upon pasting, even though important clients (such as Google Docs and Confluence) depend on the 'text/html' data in order to correctly handle the paste (rather than paste as an image of a table). To fix this, we add an exception to the DataTransfer.getData codepath when the pasteboard contains files. Instead of always returning the empty string for text/html, we still allow pasteboard access, but only read from a limited set of rich text types, i.e. web archive, RTF(D), and HTML markup. Importantly, this prevents us from exposing any file paths that appear as plain text or URLs on the pasteboard. Just as in the regular codepath for getData(), if the pasteboard data comes from the same origin, we allow unsanitized access; otherwise, we use WebContentMarkupReader to extract markup from the pasteboard. Tests: PasteMixedContent.ImageFileAndPlainText PasteMixedContent.ImageFileAndWebArchive PasteMixedContent.ImageFileAndHTML PasteMixedContent.ImageFileAndRTF PasteMixedContent.ImageFileAndURL PasteMixedContent.ImageFileWithHTMLAndURL DataInteractionTests.DataTransferGetDataWhenDroppingImageAndMarkup Also rebaselined some layout tests, which cover changes in behavior when dropping on macOS and pasting on iOS. * dom/DataTransfer.cpp: (WebCore::DataTransfer::getDataForItem const): Augment the codepath handling the case where the pasteboard contains files, such that we allow reading "text/html", but only from rich text types. (WebCore::DataTransfer::readStringFromPasteboard const): Factor out logic for reading from the pasteboard into a private helper. This is called in two places from getDataForItem: in the normal (existing) path, and in the case where we allow 'text/html' to be read despite files appearing in the pasteboard. One important difference here is that this helper now takes a WebContentReadingPolicy, whose purpose is to prevent reading from non-rich-text types when files appear in the pasteboard. Another tweak here is that we now use `lowercaseType` instead of the original (unadjusted) `type` when reading from the pasteboard. This doesn't seem to be intended in the first place. (WebCore::DataTransfer::types const): Tweak the implementation of DataTransfer.types() in the case where files exist on the pasteboard, such that we also add "text/html" if it is present in the list of DOM-safe types. * dom/DataTransfer.h: * platform/Pasteboard.h: Introduce WebContentReadingPolicy, which indicates whether or not we should limit web content reading from the pasteboard to only rich text types upon paste or drop. Normally, we allow all types to be read as web content (::AnyType), but when files appear on the pasteboard, we force OnlyRichTextTypes to ensure that no other types can unintentionally be read back as web content. * platform/StaticPasteboard.h: * platform/gtk/PasteboardGtk.cpp: (WebCore::Pasteboard::read): * platform/ios/PasteboardIOS.mm: Teach Pasteboard (on iOS) to respect WebContentReadingPolicy. (WebCore::isTypeAllowedByReadingPolicy): (WebCore::Pasteboard::read): (WebCore::Pasteboard::readRespectingUTIFidelities): * platform/mac/PasteboardMac.mm: Teach Pasteboard (on macOS) to respect WebContentReadingPolicy. (WebCore::Pasteboard::read): * platform/win/PasteboardWin.cpp: (WebCore::Pasteboard::read): * platform/wpe/PasteboardWPE.cpp: (WebCore::Pasteboard::read): Adjust non-Cocoa Pasteboard implementations for an interface change. Tools: Add new API tests to exercise pasting images with various other content types on macOS, and when dropping images and HTML markup on iOS. See the WebCore ChangeLog for more detail. * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: * TestWebKitAPI/Tests/WebKitCocoa/DataTransfer.html: Added. Add a new API test harness that dumps various bits of information about a DataTransfer upon paste and drop. While somewhat similar to some existing harnesses, this makes a distinction between the raw HTML data on the pasteboard and the actual result of inserting said HTML into the DOM. This allows us to check that the HTML has been sanitized, while making checks for the actual content of the HTML robust against inline style changes. * TestWebKitAPI/Tests/WebKitCocoa/PasteImage.mm: * TestWebKitAPI/Tests/WebKitCocoa/PasteMixedContent.mm: Added. Add a new test suite to exercise pasting mixed content types. In these test cases, the pasteboard contains a file, with some combination of plain text, rich text, and URLs. (imagePath): (writeTypesAndDataToPasteboard): Add a helper to write a var-arg list of content types and data to the general NSPasteboard. (setUpWebView): (markupString): (TestWebKitAPI::TEST): * TestWebKitAPI/Tests/ios/DataInteractionTests.mm: (TestWebKitAPI::testIconImageData): (TestWebKitAPI::TEST): * TestWebKitAPI/cocoa/TestWKWebView.h: Move a private declaration of -[WKWebView paste:] out to TestWKWebView.h, so that it can be shared across multiple tests. Currently, it only resides in PasteImage.mm, but I need it in PasteMixedContent.mm as well. LayoutTests: Rebaseline some existing layout tests. We now expose "text/html" alongside "Files" on DataTransfer.types() in some circumstances. This also provides some test coverage for ensuring that the paste codepath iOS allows the page to request HTML, even if there are files on the pasteboard. See the WebCore ChangeLog for more detail. * editing/pasteboard/data-transfer-item-list-add-file-multiple-times-expected.txt: * editing/pasteboard/data-transfer-item-list-add-file-on-copy-expected.txt: * editing/pasteboard/data-transfer-item-list-add-file-on-drag-expected.txt: Adjust test expectations for the additional "text/html" type. * editing/pasteboard/paste-image-does-not-reveal-file-url-expected.txt: * editing/pasteboard/paste-image-does-not-reveal-file-url.html: Instead of checking that types is [ "Files" ], just check that types contains "Files". On iOS, copying a selected image does not also copy HTML, but on macOS it does; this covers both cases. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@228340 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit is a cross-platform web browser engine. On iOS and macOS, it powers Safari, Mail, iBooks, and many other applications.
Visit WebKit Feature Status page to see which Web API has been implemented, in development, or under consideration.
On macOS, download Safari Technology Preview to test the latest version of WebKit. On Linux, download Epiphany Technology Preview. On Windows, you'll have to build it yourself.
Once your bug is filed, you will receive email when it is updated at each stage in the bug life cycle. After the bug is considered fixed, you may be asked to download the latest nightly and confirm that the fix works for you.
On Windows, follow the instructions on our website.
Run the following command to clone WebKit's Git SVN repository:
git clone git://git.webkit.org/WebKit.git WebKit
If you want to be able to commit changes to the repository, or just want to check out branches that aren’t contained in WebKit.git, you will need track WebKit's Subversion repository. You can run the following command to configure this and other options of the new Git clone for WebKit development.
Tools/Scripts/webkit-patch setup-git-clone
For information about this, and other aspects of using Git with WebKit, read the wiki page.
If you don‘t want to use Git, run the following command to check out WebKit’s Subversion repository:
svn checkout https://svn.webkit.org/repository/webkit/trunk WebKit
Install Xcode and its command line tools if you haven't done so already:
xcode-select --install
Run the following command to build a debug build with debugging symbols and assertions:
Tools/Scripts/build-webkit --debug
For performance testing, and other purposes, use --release
instead.
You can open WebKit.xcworkspace
to build and debug WebKit within WebKit.
If you don't use a custom build location in Xcode preferences, you have to update the workspace settings to use WebKitBuild
directory. In menu bar, choose File > Workspace Settings, then click the Advanced button, select “Custom”, “Relative to Workspace”, and enter WebKitBuild
for both Products and Intermediates.
The first time after you install a new Xcode, you will need to run the following command to enable Xcode to build command line tools for iOS Simulator:
sudo Tools/Scripts/configure-xcode-for-ios-development
Without this step, you will see the error message: “target specifies product type ‘com.apple.product-type.tool’, but there’s no such product type for the ‘iphonesimulator’ platform.
” when building target JSCLLIntOffsetsExtractor
of project JavaScriptCore
.
Run the following command to build a debug build with debugging symbols and assertions for iOS:
Tools/Scripts/build-webkit --debug --ios-simulator.
For production builds:
cmake -DPORT=GTK -DCMAKE_BUILD_TYPE=RelWithDebInfo -GNinja ninja sudo ninja install
For development builds:
Tools/gtk/install-dependencies Tools/Scripts/update-webkitgtk-libs Tools/Scripts/build-webkit --gtk --debug
For more information on building WebKitGTK+, see the wiki page.
For production builds:
cmake -DPORT=WPE -DCMAKE_BUILD_TYPE=RelWithDebInfo -GNinja ninja sudo ninja install
For development builds:
Tools/wpe/install-dependencies Tools/Scripts/update-webkitwpe-libs Tools/Scripts/build-webkit --wpe --debug
For building WebKit on Windows, see the wiki page.
Run the following command to launch Safari with your local build of WebKit:
Tools/Scripts/run-safari --debug
The run-safari
script sets the DYLD_FRAMEWORK_PATH
environment variable to point to your build products, and then launches /Applications/Safari.app
. DYLD_FRAMEWORK_PATH
tells the system loader to prefer your build products over the frameworks installed in /System/Library/Frameworks
.
To run other applications with your local build of WebKit, run the following command:
Tools/Scripts/run-webkit-app <application-path>
Run the following command to launch iOS simulator with your local build of WebKit:
run-safari --debug --ios-simulator
In both cases, if you have built release builds instead, use --release
instead of --debug
.
If you have a development build, you can use the run-minibrowser script, e.g.:
run-minibrowser --debug --wpe
Pass one of --gtk
, --jsc-only
, or --wpe
to indicate the port to use.
Congratulations! You’re up and running. Now you can begin coding in WebKit and contribute your fixes and new features to the project. For details on submitting your code to the project, read Contributing Code.