Changeset 266151 in webkit

Timestamp:

Aug 25, 2020, 3:46:16 PM (5 years ago)

Author:

timothy_horton@apple.com

Message:

Web Share API can share non-HTTP(S) URLs
​https://bugs.webkit.org/show_bug.cgi?id=215823
<rdar://problem/62083130>

Reviewed by Wenson Hsieh.

Source/WebCore:

Test: fast/web-share/share-disallows-file-urls.html

• page/Navigator.cpp:

(WebCore::shareableURLForShareData):
(WebCore::Navigator::canShare):
(WebCore::Navigator::share):
Factor out the code to complete and check the scheme of the URL.
Make canShare() return NO and share() fail for non-HTTP(S) or data: URLs.

Source/WebKit:

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::showShareSheet):
Ensure that only HTTP family or data: URLs are shared.

LayoutTests:

• fast/web-share/share-disallows-file-urls-expected.txt: Added.
• fast/web-share/share-disallows-file-urls.html: Added.
• fast/web-share/share-transient-activation-expired.html:
• fast/web-share/share-transient-activation.html:
• fast/web-share/share.html:

Add a test that ensures that sharing a non-HTTP-family URL fails,
and fix the existing tests to share HTTP-family URLs.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/web-share/share-disallows-file-urls-expected.txt (added)
• LayoutTests/fast/web-share/share-disallows-file-urls.html (added)
• LayoutTests/fast/web-share/share-transient-activation-expired.html (modified) (1 diff)
• LayoutTests/fast/web-share/share-transient-activation.html (modified) (1 diff)
• LayoutTests/fast/web-share/share.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/Navigator.cpp (modified) (4 diffs)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/WebPageProxy.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 2020-08-25  Per Arne Vollan  <pvollan@apple.com>
 

trunk/LayoutTests/fast/web-share/share-transient-activation-expired.html

@@ -24 +24 @@
                     // Cause the transient activation to expire with a setTimeout.
                     setTimeout(() => {
-                        navigator.share({ title: "Example Page", url: "url", text: "text" }).then((result) => {
+                        navigator.share({ title: "Example Page", url: "", text: "text" }).then((result) => {
                             write("FAIL: Share sheet invoked.");
                             testRunner.notifyDone();

trunk/LayoutTests/fast/web-share/share-transient-activation.html

@@ -19 +19 @@
             document.getElementById("target").addEventListener("click", () => {
                 fetch("../files/resources/abe.png").then(() => {
-                    navigator.share({ title: "Example Page", url: "url", text: "text" }).then((result) => {
+                    navigator.share({ title: "Example Page", url: "", text: "text" }).then((result) => {
                         write("PASS: Share sheet invoked.");
                         testRunner.notifyDone();

trunk/LayoutTests/fast/web-share/share.html

@@ -18 +18 @@
         {
             document.getElementById("target").addEventListener("click", () => {
-                navigator.share({ title: "Example Page", url: "url", text: "text" }).then((result) => {
+                navigator.share({ title: "Example Page", url: "", text: "text" }).then((result) => {
                     write("PASS: Share sheet invoked.");
                     testRunner.notifyDone();

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 2020-08-25  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/page/Navigator.cpp

@@ -111 +111 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 bool Navigator::canShare(ScriptExecutionContext& context, const ShareData& data)
 {
@@ -127 +141 @@
     }
 
-    Optional<URL> url;
-    if (!data.url.isNull()) {
-        url = context.completeURL(data.url);
-        if (!url->isValid())
-            return false;
-    }
+    if (!data.url.isNull() && !shareableURLForShareData(context, data))
+        return false;
+
     return true;
 }
@@ -142 +153 @@
         return;
     }
-    
-    Optional<URL> url;
-    if (!data.url.isEmpty())
-        url = context.completeURL(data.url);
-    
+
     auto* window = this->window();
     // Note that the specification does not indicate we should consume user activation. We are intentionally stricter here.
@@ -153 +160 @@
         return;
     }
-    
+
+    Optional<URL> url = shareableURLForShareData(context, data);
     ShareDataWithParsedURL shareData = {
         data,

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+
+
+
+
+
+
+
+
+
+
+
+
 2020-08-25  Megan Gardner  <megan_gardner@apple.com>
 

trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -5945 +5945 @@
 void WebPageProxy::showShareSheet(const ShareDataWithParsedURL& shareData, CompletionHandler<void(bool)>&& completionHandler)
 {
+
     pageClient().showShareSheet(shareData, WTFMove(completionHandler));
 }