<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[186196] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/186196">186196</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2015-07-01 14:54:59 -0700 (Wed, 01 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Never try to pass URLs to LaunchServices when they're the same domain as the current URL.
<rdar://problem/20731429> and https://bugs.webkit.org/show_bug.cgi?id=146521
Reviewed by Alex Christensen.
* UIProcess/Cocoa/NavigationState.mm:
(WebKit::tryAppLink): Compare the proposed URL to the current URL to see if they’re in the same domain.
(WebKit::NavigationState::NavigationClient::decidePolicyForNavigationAction):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaNavigationStatemm">trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (186195 => 186196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-07-01 21:52:07 UTC (rev 186195)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-01 21:54:59 UTC (rev 186196)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-07-01 Brady Eidson <beidson@apple.com>
+
+ Never try to pass URLs to LaunchServices when they're the same domain as the current URL.
+ <rdar://problem/20731429> and https://bugs.webkit.org/show_bug.cgi?id=146521
+
+ Reviewed by Alex Christensen.
+
+ * UIProcess/Cocoa/NavigationState.mm:
+ (WebKit::tryAppLink): Compare the proposed URL to the current URL to see if they’re in the same domain.
+ (WebKit::NavigationState::NavigationClient::decidePolicyForNavigationAction):
+
</ins><span class="cx"> 2015-07-01 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> WKWebView snapshots have the wrong scale after rotation
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaNavigationStatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm (186195 => 186196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2015-07-01 21:52:07 UTC (rev 186195)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2015-07-01 21:54:59 UTC (rev 186196)
</span><span class="lines">@@ -63,6 +63,7 @@
</span><span class="cx"> #import "_WKRenderingProgressEventsInternal.h"
</span><span class="cx"> #import "_WKSameDocumentNavigationTypeInternal.h"
</span><span class="cx"> #import <WebCore/Credential.h>
</span><ins>+#import <WebCore/URL.h>
</ins><span class="cx"> #import <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><span class="cx"> #if HAVE(APP_LINKS)
</span><span class="lines">@@ -73,6 +74,8 @@
</span><span class="cx"> #import "QuickLookDocumentData.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+using namespace WebCore;
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> static HashMap<WebPageProxy*, NavigationState*>& navigationStates()
</span><span class="lines">@@ -230,33 +233,44 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void tryAppLink(RefPtr<API::NavigationAction> navigationAction, std::function<void (bool)> completionHandler)
</del><ins>+static void tryAppLink(RefPtr<API::NavigationAction> navigationAction, const String& currentMainFrameURL, std::function<void (bool)> completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> #if HAVE(APP_LINKS)
</span><span class="cx"> bool mainFrameNavigation = !navigationAction->targetFrame() || navigationAction->targetFrame()->isMainFrame();
</span><span class="cx"> bool shouldOpenExternalURLs = navigationAction->shouldOpenExternalURLs();
</span><del>- if (mainFrameNavigation && shouldOpenExternalURLs) {
- auto* localCompletionHandler = new std::function<void (bool)>(WTF::move(completionHandler));
- [LSAppLink openWithURL:navigationAction->request().url() completionHandler:[localCompletionHandler](BOOL success, NSError *) {
- dispatch_async(dispatch_get_main_queue(), [localCompletionHandler, success] {
- (*localCompletionHandler)(success);
- delete localCompletionHandler;
- });
- }];
</del><ins>+ if (!mainFrameNavigation || !shouldOpenExternalURLs) {
+ completionHandler(false);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><ins>+ // 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())) {
+ completionHandler(false);
+ return;
+ }
+
+ auto* localCompletionHandler = new std::function<void (bool)>(WTF::move(completionHandler));
+ [LSAppLink openWithURL:navigationAction->request().url() completionHandler:[localCompletionHandler](BOOL success, NSError *) {
+ dispatch_async(dispatch_get_main_queue(), [localCompletionHandler, success] {
+ (*localCompletionHandler)(success);
+ delete localCompletionHandler;
+ });
+ }];
+#else
</ins><span class="cx"> completionHandler(false);
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void NavigationState::NavigationClient::decidePolicyForNavigationAction(WebPageProxy&, API::NavigationAction& navigationAction, Ref<WebFramePolicyListenerProxy>&& listener, API::Object* userData)
</del><ins>+void NavigationState::NavigationClient::decidePolicyForNavigationAction(WebPageProxy& webPageProxy, API::NavigationAction& navigationAction, Ref<WebFramePolicyListenerProxy>&& listener, API::Object* userData)
</ins><span class="cx"> {
</span><ins>+ String mainFrameURLString = webPageProxy.mainFrame()->url();
+
</ins><span class="cx"> if (!m_navigationState.m_navigationDelegateMethods.webViewDecidePolicyForNavigationActionDecisionHandler) {
</span><span class="cx"> RefPtr<API::NavigationAction> localNavigationAction = &navigationAction;
</span><span class="cx"> RefPtr<WebFramePolicyListenerProxy> localListener = WTF::move(listener);
</span><span class="cx">
</span><del>- tryAppLink(localNavigationAction, [localListener, localNavigationAction] (bool followedLinkToApp) {
</del><ins>+ tryAppLink(localNavigationAction, mainFrameURLString, [localListener, localNavigationAction] (bool followedLinkToApp) {
</ins><span class="cx"> if (followedLinkToApp) {
</span><span class="cx"> localListener->ignore();
</span><span class="cx"> return;
</span><span class="lines">@@ -292,12 +306,12 @@
</span><span class="cx"> RefPtr<API::NavigationAction> localNavigationAction = &navigationAction;
</span><span class="cx"> RefPtr<WebFramePolicyListenerProxy> localListener = WTF::move(listener);
</span><span class="cx"> RefPtr<CompletionHandlerCallChecker> checker = CompletionHandlerCallChecker::create(navigationDelegate.get(), @selector(webView:decidePolicyForNavigationAction:decisionHandler:));
</span><del>- [navigationDelegate webView:m_navigationState.m_webView decidePolicyForNavigationAction:wrapper(navigationAction) decisionHandler:[localListener, localNavigationAction, checker](WKNavigationActionPolicy actionPolicy) {
</del><ins>+ [navigationDelegate webView:m_navigationState.m_webView decidePolicyForNavigationAction:wrapper(navigationAction) decisionHandler:[localListener, localNavigationAction, checker, mainFrameURLString](WKNavigationActionPolicy actionPolicy) {
</ins><span class="cx"> checker->didCallCompletionHandler();
</span><span class="cx">
</span><span class="cx"> switch (actionPolicy) {
</span><span class="cx"> case WKNavigationActionPolicyAllow:
</span><del>- tryAppLink(localNavigationAction, [localListener](bool followedLinkToApp) {
</del><ins>+ tryAppLink(localNavigationAction, mainFrameURLString, [localListener](bool followedLinkToApp) {
</ins><span class="cx"> if (followedLinkToApp) {
</span><span class="cx"> localListener->ignore();
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>