Changeset 270072 in webkit

Timestamp:

Nov 19, 2020 11:33:31 PM (3 years ago)

Author:

Wenson Hsieh

Message:

REGRESSION (r259151): The "Convert Text to Traditional Chinese" services menu action is broken
​https://bugs.webkit.org/show_bug.cgi?id=219190
<rdar://problem/71438389>

Reviewed by Tim Horton.

Source/WebKit:

Some system services, such as "Convert Text to (Traditional|Simplified) Chinese", use `-[NSServicesMenuRequestor
readSelectionFromPasteboard:]` to insert the contents of the given pasteboard into the current selection. After
the changes in r259151, this requires the UI process to explicitly grant access to the contents of the given
pasteboard, on behalf of the web content process.

Fix the bug by adding the missing call to grantAccessToCurrentPasteboardData. This is only called from API in
the UI process, so it cannot be abused by a compromised web content process to grab the contents of
NSPasteboard.

Test: PasteHTML.ReadSelectionFromPasteboard

• UIProcess/mac/WebPageProxyMac.mm:

(WebKit::WebPageProxy::readSelectionFromPasteboard):

Tools:

Add an API test to exercise -readSelectionFromPasteboard:.

• TestWebKitAPI/Tests/WebKitCocoa/PasteHTML.mm:

(TEST):

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/mac/WebPageProxyMac.mm (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/PasteHTML.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-11-19  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        REGRESSION (r259151): The "Convert Text to Traditional Chinese" services menu action is broken
+        https://bugs.webkit.org/show_bug.cgi?id=219190
+        <rdar://problem/71438389>
+
+        Reviewed by Tim Horton.
+
+        Some system services, such as "Convert Text to (Traditional|Simplified) Chinese", use `-[NSServicesMenuRequestor
+        readSelectionFromPasteboard:]` to insert the contents of the given pasteboard into the current selection. After
+        the changes in r259151, this requires the UI process to explicitly grant access to the contents of the given
+        pasteboard, on behalf of the web content process.
+
+        Fix the bug by adding the missing call to `grantAccessToCurrentPasteboardData`. This is only called from API in
+        the UI process, so it cannot be abused by a compromised web content process to grab the contents of
+        `NSPasteboard`.
+
+        Test: PasteHTML.ReadSelectionFromPasteboard
+
+        * UIProcess/mac/WebPageProxyMac.mm:
+        (WebKit::WebPageProxy::readSelectionFromPasteboard):
+
 2020-11-19  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Source/WebKit/UIProcess/mac/WebPageProxyMac.mm

@@ -272 +272 @@
         return false;
 
+    grantAccessToCurrentPasteboardData(pasteboardName);
+
     bool result = false;
     const Seconds messageTimeout(20);

trunk/Tools/ChangeLog

@@ +1 @@
+2020-11-19  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        REGRESSION (r259151): The "Convert Text to Traditional Chinese" services menu action is broken
+        https://bugs.webkit.org/show_bug.cgi?id=219190
+        <rdar://problem/71438389>
+
+        Reviewed by Tim Horton.
+
+        Add an API test to exercise `-readSelectionFromPasteboard:`.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/PasteHTML.mm:
+        (TEST):
+
 2020-11-19  Hoa Dinh  <dvh@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/PasteHTML.mm

@@ -46 +46 @@
 
 #if PLATFORM(MAC)
+@interface WKWebView () <NSServicesMenuRequestor>
+@end
+
 void writeHTMLToPasteboard(NSString *html)
 {
@@ -388 +391 @@
 }
 
+#if PLATFORM(MAC)
+
+TEST(PasteHTML, ReadSelectionFromPasteboard)
+{
+    auto generalPasteboard = NSPasteboard.generalPasteboard;
+    [generalPasteboard clearContents];
+    [generalPasteboard setString:@"Hello world" forType:NSPasteboardTypeString];
+
+    auto webView = createWebViewWithCustomPasteboardDataSetting(true);
+    [webView synchronouslyLoadHTMLString:@"<input autofocus>"];
+    [webView readSelectionFromPasteboard:generalPasteboard];
+
+    NSString *inputValue = [webView stringByEvaluatingJavaScript:@"document.querySelector('input').value"];
+    EXPECT_WK_STREQ(inputValue, "Hello world");
+}
+
+#endif // PLATFORM(MAC)
+
 #if ENABLE(DARK_MODE_CSS) && HAVE(OS_DARK_MODE_SUPPORT)