Changeset 186664 in webkit

Timestamp:

Jul 9, 2015 10:18:53 PM (9 years ago)

Author:

mitz@apple.com

Message:

Source/WebCore:
WebCore part of Track and expose policies for external URL schemes and App Links separately
​https://bugs.webkit.org/show_bug.cgi?id=146822

Reviewed by Anders Carlsson.

• loader/FrameLoaderTypes.h: Added ShouldOpenExternalURLsPolicy::ShouldAllowExternalSchemes,

meaning external schemes are allowed but App Links are not. The opposite state doesn’t
exist.

• page/ContextMenuController.cpp:

(WebCore::ContextMenuController::contextMenuItemSelected): Opening a link in a new window
or in the current window should never open it as an App Link.

Source/WebKit2:
WebKit2 part of Track and expose policies for external URL schemes and App Links separately
​https://bugs.webkit.org/show_bug.cgi?id=146822

Reviewed by Anders Carlsson.

• Shared/NavigationActionData.cpp:

(WebKit::NavigationActionData::encode):
(WebKit::NavigationActionData::decode):

• Shared/NavigationActionData.h: Replaced the shouldOpenExternalURLsPolicy boolean member with a shouldOpenExternalURLsPolicy member whose type is ShouldOpenExternalURLsPolicy, and updated encoding and decoding:

• UIProcess/API/APINavigationAction.h: Added shouldOpenAppLinks boolean to NavigationAction::create and the constructor. It augments the policy in the NavigationActionData with a valude decided in the UI process. Replaced shouldOpenExternalURLs() with shouldOpenExternalSchemes() and shouldOpenAppLinks() which check the policy and the new m_shouldOpenAppLinks boolean.

• UIProcess/API/Cocoa/WKNavigationAction.mm:

(-[WKNavigationAction _shouldOpenExternalSchemes]): Getter for new property, calls through

to the NavigationAction.

(-[WKNavigationAction _shouldOpenAppLinks]): Ditto.
(-[WKNavigationAction _shouldOpenExternalURLs]): Now deprecated and returns the

_shouldOpenExternalSchemes value.

• UIProcess/API/Cocoa/WKNavigationActionPrivate.h: Declared new properties for the two policies and deprecated old property.

• UIProcess/Cocoa/NavigationState.mm:

(WebKit::tryAppLink): Changed to use NavigationAction::shouldOpenAppLinks, which

encapsulates logic that used to be here.

• UIProcess/Cocoa/UIDelegate.mm:

(WebKit::UIDelegate::UIClient::createNewPage): Allow App Links (if already allowed by policy).

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::decidePolicyForNavigationAction): Moved logic from tryAppLink in

NavigationState.mm here and pass the result to NavigationAction::create.

(WebKit::WebPageProxy::decidePolicyForNewWindowAction): Allow App Links (if already allowed

by policy).

• UIProcess/WebPageProxy.h:

(WebKit::WebPageProxy::loadRequest): Changed the default policy to not allow App Links (but

still allow external schemes).

• WebProcess/InjectedBundle/API/c/WKBundleNavigationAction.cpp:

(WKBundleNavigationActionGetShouldTryAppLinks): Added this getter.

• WebProcess/InjectedBundle/API/c/WKBundleNavigationActionPrivate.h:

• WebProcess/InjectedBundle/InjectedBundleNavigationAction.cpp:

(WebKit::InjectedBundleNavigationAction::InjectedBundleNavigationAction):

• WebProcess/InjectedBundle/InjectedBundleNavigationAction.h: Added m_shouldTryAppLinks boolean member, initialized from the policy. Updated the initialization of m_shouldOpenExternalURLs to account for the new policy.

• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:

(WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction): Pass the policy

in the navigation data.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/loader/FrameLoaderTypes.h (modified) (1 diff)
• WebCore/page/ContextMenuController.cpp (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Shared/NavigationActionData.cpp (modified) (2 diffs)
• WebKit2/Shared/NavigationActionData.h (modified) (1 diff)
• WebKit2/UIProcess/API/APINavigationAction.h (modified) (3 diffs)
• WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm (modified) (1 diff)
• WebKit2/UIProcess/API/Cocoa/WKNavigationActionPrivate.h (modified) (1 diff)
• WebKit2/UIProcess/Cocoa/NavigationState.mm (modified) (1 diff)
• WebKit2/UIProcess/Cocoa/UIDelegate.mm (modified) (1 diff)
• WebKit2/UIProcess/WebPageProxy.cpp (modified) (2 diffs)
• WebKit2/UIProcess/WebPageProxy.h (modified) (1 diff)
• WebKit2/WebProcess/InjectedBundle/API/c/WKBundleNavigationAction.cpp (modified) (1 diff)
• WebKit2/WebProcess/InjectedBundle/API/c/WKBundleNavigationActionPrivate.h (modified) (1 diff)
• WebKit2/WebProcess/InjectedBundle/InjectedBundleNavigationAction.cpp (modified) (1 diff)
• WebKit2/WebProcess/InjectedBundle/InjectedBundleNavigationAction.h (modified) (2 diffs)
• WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-07-09  Dan Bernstein  <mitz@apple.com>
+
+        WebCore part of Track and expose policies for external URL schemes and App Links separately
+        https://bugs.webkit.org/show_bug.cgi?id=146822
+
+        Reviewed by Anders Carlsson.
+
+        * loader/FrameLoaderTypes.h: Added ShouldOpenExternalURLsPolicy::ShouldAllowExternalSchemes,
+        meaning external schemes are allowed but App Links are not. The opposite state doesn’t
+        exist.
+
+        * page/ContextMenuController.cpp:
+        (WebCore::ContextMenuController::contextMenuItemSelected): Opening a link in a new window
+        or in the current window should never open it as an App Link.
+
 2015-07-09  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebCore/loader/FrameLoaderTypes.h

@@ -74 +74 @@
 enum class ShouldOpenExternalURLsPolicy {
     ShouldNotAllow,
+    ShouldAllowExternalSchemes,
     ShouldAllow,
 };

trunk/Source/WebCore/page/ContextMenuController.cpp

@@ -239 +239 @@
     switch (item->action()) {
     case ContextMenuItemTagOpenLinkInNewWindow:
-        openNewWindow(m_context.hitTestResult().absoluteLinkURL(), frame, ShouldOpenExternalURLsPolicy::ShouldAllow);
+        openNewWindow(m_context.hitTestResult().absoluteLinkURL(), frame, ShouldOpenExternalURLsPolicy::ShouldAllowExternalSchemes);
         break;
     case ContextMenuItemTagDownloadLinkToDisk:
@@ -407 +407 @@
         break;
     case ContextMenuItemTagOpenLinkInThisWindow:
-        frame->loader().loadFrameRequest(FrameLoadRequest(frame->document()->securityOrigin(), ResourceRequest(m_context.hitTestResult().absoluteLinkURL(), frame->loader().outgoingReferrer()), LockHistory::No, LockBackForwardList::No, MaybeSendReferrer, AllowNavigationToInvalidURL::Yes, NewFrameOpenerPolicy::Suppress, ShouldOpenExternalURLsPolicy::ShouldAllow), nullptr, nullptr);
+        frame->loader().loadFrameRequest(FrameLoadRequest(frame->document()->securityOrigin(), ResourceRequest(m_context.hitTestResult().absoluteLinkURL(), frame->loader().outgoingReferrer()), LockHistory::No, LockBackForwardList::No, MaybeSendReferrer, AllowNavigationToInvalidURL::Yes, NewFrameOpenerPolicy::Suppress, ShouldOpenExternalURLsPolicy::ShouldAllowExternalSchemes), nullptr, nullptr);
         break;
     case ContextMenuItemTagBold:

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-07-09  Dan Bernstein  <mitz@apple.com>
+
+        WebKit2 part of Track and expose policies for external URL schemes and App Links separately
+        https://bugs.webkit.org/show_bug.cgi?id=146822
+
+        Reviewed by Anders Carlsson.
+
+        * Shared/NavigationActionData.cpp:
+        (WebKit::NavigationActionData::encode):
+        (WebKit::NavigationActionData::decode):
+        * Shared/NavigationActionData.h:
+          Replaced the shouldOpenExternalURLsPolicy boolean member with a
+          shouldOpenExternalURLsPolicy member whose type is ShouldOpenExternalURLsPolicy, and
+          updated encoding and decoding:
+
+        * UIProcess/API/APINavigationAction.h:
+          Added shouldOpenAppLinks boolean to NavigationAction::create and the constructor. It
+          augments the policy in the NavigationActionData with a valude decided in the UI process.
+          Replaced shouldOpenExternalURLs() with shouldOpenExternalSchemes() and
+          shouldOpenAppLinks() which check the policy and the new m_shouldOpenAppLinks boolean.
+
+        * UIProcess/API/Cocoa/WKNavigationAction.mm:
+        (-[WKNavigationAction _shouldOpenExternalSchemes]): Getter for new property, calls through
+          to the NavigationAction.
+        (-[WKNavigationAction _shouldOpenAppLinks]): Ditto.
+        (-[WKNavigationAction _shouldOpenExternalURLs]): Now deprecated and returns the
+          _shouldOpenExternalSchemes value.
+        * UIProcess/API/Cocoa/WKNavigationActionPrivate.h: Declared new properties for the two
+          policies and deprecated old property.
+
+        * UIProcess/Cocoa/NavigationState.mm:
+        (WebKit::tryAppLink): Changed to use NavigationAction::shouldOpenAppLinks, which
+          encapsulates logic that used to be here.
+
+        * UIProcess/Cocoa/UIDelegate.mm:
+        (WebKit::UIDelegate::UIClient::createNewPage): Allow App Links (if already allowed by policy).
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::decidePolicyForNavigationAction): Moved logic from tryAppLink in
+          NavigationState.mm here and pass the result to NavigationAction::create.
+        (WebKit::WebPageProxy::decidePolicyForNewWindowAction): Allow App Links (if already allowed
+          by policy).
+        * UIProcess/WebPageProxy.h:
+        (WebKit::WebPageProxy::loadRequest): Changed the default policy to not allow App Links (but
+          still allow external schemes).
+
+        * WebProcess/InjectedBundle/API/c/WKBundleNavigationAction.cpp:
+        (WKBundleNavigationActionGetShouldTryAppLinks): Added this getter.
+        * WebProcess/InjectedBundle/API/c/WKBundleNavigationActionPrivate.h:
+
+        * WebProcess/InjectedBundle/InjectedBundleNavigationAction.cpp:
+        (WebKit::InjectedBundleNavigationAction::InjectedBundleNavigationAction):
+        * WebProcess/InjectedBundle/InjectedBundleNavigationAction.h:
+          Added m_shouldTryAppLinks boolean member, initialized from the policy. Updated the
+          initialization of m_shouldOpenExternalURLs to account for the new policy.
+
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction): Pass the policy
+          in the navigation data.
+
 2015-07-09  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/Shared/NavigationActionData.cpp

@@ -41 +41 @@
     encoder << isProcessingUserGesture;
     encoder << canHandleRequest;
-    encoder << shouldOpenExternalURLs;
+    encoder.encodeEnum(shouldOpenExternalURLsPolicy);
 }
 
@@ -56 +56 @@
     if (!decoder.decode(result.canHandleRequest))
         return false;
-    if (!decoder.decode(result.shouldOpenExternalURLs))
+    if (!decoder.decodeEnum(result.shouldOpenExternalURLsPolicy))
         return false;
 

trunk/Source/WebKit2/Shared/NavigationActionData.h

@@ -46 +46 @@
     bool isProcessingUserGesture { false };
     bool canHandleRequest { false };
-    bool shouldOpenExternalURLs { false };
+    WebCore::ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy { WebCore::ShouldOpenExternalURLsPolicy::ShouldNotAllow };
 };
 

trunk/Source/WebKit2/UIProcess/API/APINavigationAction.h

@@ -39 +39 @@
 class NavigationAction final : public ObjectImpl<Object::Type::NavigationAction> {
 public:
-    static Ref<NavigationAction> create(const WebKit::NavigationActionData& navigationActionData, API::FrameInfo* sourceFrame, API::FrameInfo* targetFrame, const WebCore::ResourceRequest& request, const WebCore::URL& originalURL)
+    static Ref<NavigationAction> create(const WebKit::NavigationActionData& navigationActionData, API::FrameInfo* sourceFrame, API::FrameInfo* targetFrame, const WebCore::ResourceRequest& request, const WebCore::URL& originalURL, bool shouldOpenAppLinks)
     {
-        return adoptRef(*new NavigationAction(navigationActionData, sourceFrame, targetFrame, request, originalURL));
+        return adoptRef(*new NavigationAction(navigationActionData, sourceFrame, targetFrame, request, originalURL, shouldOpenAppLinks));
     }
 
-    NavigationAction(const WebKit::NavigationActionData& navigationActionData, API::FrameInfo* sourceFrame, API::FrameInfo* targetFrame, const WebCore::ResourceRequest& request, const WebCore::URL& originalURL)
+    NavigationAction(const WebKit::NavigationActionData& navigationActionData, API::FrameInfo* sourceFrame, API::FrameInfo* targetFrame, const WebCore::ResourceRequest& request, const WebCore::URL& originalURL, bool shouldOpenAppLinks)
         : m_sourceFrame(sourceFrame)
         , m_targetFrame(targetFrame)
         , m_request(request)
         , m_originalURL(originalURL)
+        , m_shouldOpenAppLinks(shouldOpenAppLinks)
         , m_navigationActionData(navigationActionData)
     {
@@ -64 +65 @@
     bool isProcessingUserGesture() const { return m_navigationActionData.isProcessingUserGesture; }
     bool canHandleRequest() const { return m_navigationActionData.canHandleRequest; }
-    bool shouldOpenExternalURLs() const { return m_navigationActionData.shouldOpenExternalURLs; }
+    bool shouldOpenExternalSchemes() const { return m_navigationActionData.shouldOpenExternalURLsPolicy == WebCore::ShouldOpenExternalURLsPolicy::ShouldAllow || m_navigationActionData.shouldOpenExternalURLsPolicy == WebCore::ShouldOpenExternalURLsPolicy::ShouldAllowExternalSchemes; }
+    bool shouldOpenAppLinks() const { return m_shouldOpenAppLinks && m_navigationActionData.shouldOpenExternalURLsPolicy == WebCore::ShouldOpenExternalURLsPolicy::ShouldAllow; }
 
 private:
@@ -73 +75 @@
     WebCore::URL m_originalURL;
 
+    bool m_shouldOpenAppLinks;
+
     WebKit::NavigationActionData m_navigationActionData;
 };

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm

@@ -173 +173 @@
 }
 
+- (BOOL)_shouldOpenExternalSchemes
+{
+    return _navigationAction->shouldOpenExternalSchemes();
+}
+
+- (BOOL)_shouldOpenAppLinks
+{
+    return _navigationAction->shouldOpenAppLinks();
+}
+
 - (BOOL)_shouldOpenExternalURLs
 {
-    return _navigationAction->shouldOpenExternalURLs();
+    return [self _shouldOpenExternalSchemes];
 }
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationActionPrivate.h

@@ -33 +33 @@
 @property (nonatomic, readonly, getter=_isUserInitiated) BOOL _userInitiated;
 @property (nonatomic, readonly) BOOL _canHandleRequest;
-@property (nonatomic, readonly) BOOL _shouldOpenExternalURLs;
+@property (nonatomic, readonly) BOOL _shouldOpenExternalSchemes WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+@property (nonatomic, readonly) BOOL _shouldOpenAppLinks WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+
+@property (nonatomic, readonly) BOOL _shouldOpenExternalURLs WK_DEPRECATED(WK_MAC_TBA, WK_MAC_TBA, WK_IOS_TBA, WK_IOS_TBA, "use _shouldOpenExternalSchemes and _shouldOpenAppLinks");
 
 @end

trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm

@@ -249 +249 @@
 {
 #if HAVE(APP_LINKS)
-    bool mainFrameNavigation = !navigationAction->targetFrame() || navigationAction->targetFrame()->isMainFrame();
-    bool shouldOpenExternalURLs = navigationAction->shouldOpenExternalURLs();
-    if (!mainFrameNavigation || !shouldOpenExternalURLs) {
-        completionHandler(false);
-        return;
-    }
-
-    // If the new URL is within the same origin as the current URL, do not try to open it externally.
-    URL currentURL = URL(ParsedURLString, currentMainFrameURL);
-    if (protocolHostAndPortAreEqual(currentURL, navigationAction->request().url())) {
+    if (!navigationAction->shouldOpenAppLinks()) {
         completionHandler(false);
         return;

trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm

@@ -106 +106 @@
 
     auto sourceFrameInfo = API::FrameInfo::create(*initiatingFrame, securityOriginData.securityOrigin());
-    auto navigationAction = API::NavigationAction::create(navigationActionData, sourceFrameInfo.ptr(), nullptr, request, WebCore::URL());
+    auto navigationAction = API::NavigationAction::create(navigationActionData, sourceFrameInfo.ptr(), nullptr, request, WebCore::URL(), true);
 
     RetainPtr<WKWebView> webView = [delegate.get() webView:m_uiDelegate.m_webView createWebViewWithConfiguration:configuration.get() forNavigationAction:wrapper(navigationAction) windowFeatures:adoptNS([[WKWindowFeatures alloc] _initWithWindowFeatures:windowFeatures]).get()];

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -3256 +3256 @@
             sourceFrameInfo = API::FrameInfo::create(*originatingFrame, originatingFrameSecurityOrigin.securityOrigin());
 
-        auto navigationAction = API::NavigationAction::create(navigationActionData, sourceFrameInfo.get(), destinationFrameInfo.get(), request, originalRequest.url());
+        bool shouldOpenAppLinks = (!destinationFrameInfo || destinationFrameInfo->isMainFrame()) && !protocolHostAndPortAreEqual(URL(ParsedURLString, m_mainFrame->url()), request.url());
+
+        auto navigationAction = API::NavigationAction::create(navigationActionData, sourceFrameInfo.get(), destinationFrameInfo.get(), request, originalRequest.url(), shouldOpenAppLinks);
 
         m_navigationClient->decidePolicyForNavigationAction(*this, navigationAction.get(), WTF::move(listener), m_process->transformHandlesToObjects(userData.object()).get());
@@ -3285 +3287 @@
             sourceFrameInfo = API::FrameInfo::create(*frame, frameSecurityOrigin.securityOrigin());
 
-        auto navigationAction = API::NavigationAction::create(navigationActionData, sourceFrameInfo.get(), nullptr, request, request.url());
+        auto navigationAction = API::NavigationAction::create(navigationActionData, sourceFrameInfo.get(), nullptr, request, request.url(), true);
 
         m_navigationClient->decidePolicyForNavigationAction(*this, navigationAction.get(), WTF::move(listener), m_process->transformHandlesToObjects(userData.object()).get());

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -364 +364 @@
     bool isClosed() const { return m_isClosed; }
 
-    RefPtr<API::Navigation> loadRequest(const WebCore::ResourceRequest&, WebCore::ShouldOpenExternalURLsPolicy = WebCore::ShouldOpenExternalURLsPolicy::ShouldAllow, API::Object* userData = nullptr);
+    RefPtr<API::Navigation> loadRequest(const WebCore::ResourceRequest&, WebCore::ShouldOpenExternalURLsPolicy = WebCore::ShouldOpenExternalURLsPolicy::ShouldAllowExternalSchemes, API::Object* userData = nullptr);
     RefPtr<API::Navigation> loadFile(const String& fileURL, const String& resourceDirectoryURL, API::Object* userData = nullptr);
     RefPtr<API::Navigation> loadData(API::Data*, const String& MIMEType, const String& encoding, const String& baseURL, API::Object* userData = nullptr);

trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleNavigationAction.cpp

@@ -72 +72 @@
     return toImpl(navigationActionRef)->shouldOpenExternalURLs();
 }
+
+bool WKBundleNavigationActionGetShouldTryAppLinks(WKBundleNavigationActionRef navigationActionRef)
+{
+    return toImpl(navigationActionRef)->shouldTryAppLinks();
+}

trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleNavigationActionPrivate.h

@@ -34 +34 @@
 
 WK_EXPORT bool WKBundleNavigationActionGetShouldOpenExternalURLs(WKBundleNavigationActionRef);
+WK_EXPORT bool WKBundleNavigationActionGetShouldTryAppLinks(WKBundleNavigationActionRef);
 
 #ifdef __cplusplus

trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleNavigationAction.cpp

@@ -91 +91 @@
     , m_modifiers(modifiersForNavigationAction(navigationAction))
     , m_mouseButton(WebMouseEvent::NoButton)
-    , m_shouldOpenExternalURLs(navigationAction.shouldOpenExternalURLsPolicy() == ShouldOpenExternalURLsPolicy::ShouldAllow)
+    , m_shouldOpenExternalURLs(navigationAction.shouldOpenExternalURLsPolicy() == ShouldOpenExternalURLsPolicy::ShouldAllow || navigationAction.shouldOpenExternalURLsPolicy() == ShouldOpenExternalURLsPolicy::ShouldAllowExternalSchemes)
+    , m_shouldTryAppLinks(navigationAction.shouldOpenExternalURLsPolicy() == ShouldOpenExternalURLsPolicy::ShouldAllow)
 {
     if (const MouseEvent* mouseEvent = mouseEventForNavigationAction(navigationAction)) {

trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleNavigationAction.h

@@ -58 +58 @@
 
     bool shouldOpenExternalURLs() const { return m_shouldOpenExternalURLs; }
+    bool shouldTryAppLinks() const { return m_shouldTryAppLinks; }
 
 private:
@@ -68 +69 @@
     RefPtr<InjectedBundleNodeHandle> m_formElement;
     bool m_shouldOpenExternalURLs;
+    bool m_shouldTryAppLinks;
 };
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

@@ -802 +802 @@
     navigationActionData.isProcessingUserGesture = navigationAction.processingUserGesture();
     navigationActionData.canHandleRequest = webPage->canHandleRequest(request);
-    navigationActionData.shouldOpenExternalURLs = navigationAction.shouldOpenExternalURLsPolicy() == ShouldOpenExternalURLsPolicy::ShouldAllow;
+    navigationActionData.shouldOpenExternalURLsPolicy = navigationAction.shouldOpenExternalURLsPolicy();
 
     WebCore::Frame* coreFrame = m_frame->coreFrame();