<!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>[193654] 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/193654">193654</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-12-07 14:44:33 -0800 (Mon, 07 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] Regression(<a href="http://trac.webkit.org/projects/webkit/changeset/187691">r187691</a>): If a page is showing an auth pane in one tab, any new tabs with same page hang until credentials are entered in first tab
https://bugs.webkit.org/show_bug.cgi?id=151960
<rdar://problem/23618112>
Reviewed by Alex Christensen.
After <a href="http://trac.webkit.org/projects/webkit/changeset/187691">r187691</a>, if a page is showing an auth pane in one tab, any new
tabs with same page hang until credentials are entered in first tab.
This is because we coalescing all authentication challenges from the
same domain, no matter what tab they are for. This can be confusing
so we now only coalesce authentication challenges within each tab,
by leveraging the pageID (in addition to the domain).
* Shared/Authentication/AuthenticationManager.cpp:
(WebKit::AuthenticationManager::shouldCoalesceChallenge):
(WebKit::AuthenticationManager::coalesceChallengesMatching):
(WebKit::AuthenticationManager::didReceiveAuthenticationChallenge):
* Shared/Authentication/AuthenticationManager.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAuthenticationAuthenticationManagercpp">trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAuthenticationAuthenticationManagerh">trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (193653 => 193654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-12-07 22:32:27 UTC (rev 193653)
+++ trunk/Source/WebKit2/ChangeLog 2015-12-07 22:44:33 UTC (rev 193654)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-12-07 Chris Dumez <cdumez@apple.com>
+
+ [WK2] Regression(r187691): If a page is showing an auth pane in one tab, any new tabs with same page hang until credentials are entered in first tab
+ https://bugs.webkit.org/show_bug.cgi?id=151960
+ <rdar://problem/23618112>
+
+ Reviewed by Alex Christensen.
+
+ After r187691, if a page is showing an auth pane in one tab, any new
+ tabs with same page hang until credentials are entered in first tab.
+ This is because we coalescing all authentication challenges from the
+ same domain, no matter what tab they are for. This can be confusing
+ so we now only coalesce authentication challenges within each tab,
+ by leveraging the pageID (in addition to the domain).
+
+ * Shared/Authentication/AuthenticationManager.cpp:
+ (WebKit::AuthenticationManager::shouldCoalesceChallenge):
+ (WebKit::AuthenticationManager::coalesceChallengesMatching):
+ (WebKit::AuthenticationManager::didReceiveAuthenticationChallenge):
+ * Shared/Authentication/AuthenticationManager.h:
+
</ins><span class="cx"> 2015-12-07 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Hook up request and show for typing candidates in WK1
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAuthenticationAuthenticationManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp (193653 => 193654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp 2015-12-07 22:32:27 UTC (rev 193653)
+++ trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp 2015-12-07 22:44:33 UTC (rev 193654)
</span><span class="lines">@@ -76,13 +76,13 @@
</span><span class="cx"> return challengeID;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool AuthenticationManager::shouldCoalesceChallenge(uint64_t challengeID, const AuthenticationChallenge& challenge) const
</del><ins>+bool AuthenticationManager::shouldCoalesceChallenge(uint64_t pageID, uint64_t challengeID, const AuthenticationChallenge& challenge) const
</ins><span class="cx"> {
</span><span class="cx"> if (!canCoalesceChallenge(challenge))
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> for (auto& item : m_challenges) {
</span><del>- if (item.key != challengeID && ProtectionSpace::compare(challenge.protectionSpace(), item.value.challenge.protectionSpace()))
</del><ins>+ if (item.key != challengeID && item.value.pageID == pageID && ProtectionSpace::compare(challenge.protectionSpace(), item.value.challenge.protectionSpace()))
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> return false;
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> return challengesToCoalesce;
</span><span class="cx">
</span><span class="cx"> for (auto& item : m_challenges) {
</span><del>- if (item.key != challengeID && ProtectionSpace::compare(challenge.challenge.protectionSpace(), item.value.challenge.protectionSpace()))
</del><ins>+ if (item.key != challengeID && item.value.pageID == challenge.pageID && ProtectionSpace::compare(challenge.challenge.protectionSpace(), item.value.challenge.protectionSpace()))
</ins><span class="cx"> challengesToCoalesce.append(item.key);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -112,14 +112,15 @@
</span><span class="cx"> ASSERT(frame);
</span><span class="cx"> ASSERT(frame->page());
</span><span class="cx">
</span><del>- uint64_t challengeID = addChallengeToChallengeMap({authenticationChallenge
</del><ins>+ auto pageID = frame->page()->pageID();
+ uint64_t challengeID = addChallengeToChallengeMap({pageID, authenticationChallenge
</ins><span class="cx"> #if USE(NETWORK_SESSION)
</span><span class="cx"> , ChallengeCompletionHandler()
</span><span class="cx"> #endif
</span><span class="cx"> });
</span><span class="cx">
</span><del>- // Coalesce challenges in the same protection space.
- if (shouldCoalesceChallenge(challengeID, authenticationChallenge))
</del><ins>+ // Coalesce challenges in the same protection space and in the same page.
+ if (shouldCoalesceChallenge(pageID, challengeID, authenticationChallenge))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_process->send(Messages::WebPageProxy::DidReceiveAuthenticationChallenge(frame->frameID(), authenticationChallenge, challengeID), frame->page()->pageID());
</span><span class="lines">@@ -131,8 +132,10 @@
</span><span class="cx"> ASSERT(pageID);
</span><span class="cx"> ASSERT(frameID);
</span><span class="cx">
</span><del>- uint64_t challengeID = addChallengeToChallengeMap({authenticationChallenge, completionHandler});
- if (shouldCoalesceChallenge(challengeID, authenticationChallenge))
</del><ins>+ uint64_t challengeID = addChallengeToChallengeMap({pageID, authenticationChallenge, completionHandler});
+
+ // Coalesce challenges in the same protection space and in the same page.
+ if (shouldCoalesceChallenge(pageID, challengeID, authenticationChallenge))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_process->send(Messages::NetworkProcessProxy::DidReceiveAuthenticationChallenge(pageID, frameID, authenticationChallenge, challengeID));
</span><span class="lines">@@ -143,12 +146,14 @@
</span><span class="cx"> ASSERT(pageID);
</span><span class="cx"> ASSERT(frameID);
</span><span class="cx">
</span><del>- uint64_t challengeID = addChallengeToChallengeMap({authenticationChallenge
</del><ins>+ uint64_t challengeID = addChallengeToChallengeMap({pageID, authenticationChallenge
</ins><span class="cx"> #if USE(NETWORK_SESSION)
</span><span class="cx"> , ChallengeCompletionHandler()
</span><span class="cx"> #endif
</span><span class="cx"> });
</span><del>- if (shouldCoalesceChallenge(challengeID, authenticationChallenge))
</del><ins>+
+ // Coalesce challenges in the same protection space and in the same page.
+ if (shouldCoalesceChallenge(pageID, challengeID, authenticationChallenge))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_process->send(Messages::NetworkProcessProxy::DidReceiveAuthenticationChallenge(pageID, frameID, authenticationChallenge, challengeID));
</span><span class="lines">@@ -157,8 +162,11 @@
</span><span class="cx"> #if !USE(NETWORK_SESSION)
</span><span class="cx"> void AuthenticationManager::didReceiveAuthenticationChallenge(Download* download, const AuthenticationChallenge& authenticationChallenge)
</span><span class="cx"> {
</span><del>- uint64_t challengeID = addChallengeToChallengeMap({authenticationChallenge});
- if (shouldCoalesceChallenge(challengeID, authenticationChallenge))
</del><ins>+ uint64_t dummyPageID = 0;
+ uint64_t challengeID = addChallengeToChallengeMap({dummyPageID, authenticationChallenge});
+
+ // Coalesce challenges in the same protection space and in the same page.
+ if (shouldCoalesceChallenge(dummyPageID, challengeID, authenticationChallenge))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> download->send(Messages::DownloadProxy::DidReceiveAuthenticationChallenge(authenticationChallenge, challengeID));
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAuthenticationAuthenticationManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.h (193653 => 193654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.h 2015-12-07 22:32:27 UTC (rev 193653)
+++ trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.h 2015-12-07 22:44:33 UTC (rev 193654)
</span><span class="lines">@@ -74,6 +74,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> struct Challenge {
</span><ins>+ uint64_t pageID;
</ins><span class="cx"> WebCore::AuthenticationChallenge challenge;
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><span class="cx"> ChallengeCompletionHandler completionHandler;
</span><span class="lines">@@ -86,7 +87,7 @@
</span><span class="cx"> bool tryUseCertificateInfoForChallenge(const WebCore::AuthenticationChallenge&, const WebCore::CertificateInfo&);
</span><span class="cx">
</span><span class="cx"> uint64_t addChallengeToChallengeMap(const Challenge&);
</span><del>- bool shouldCoalesceChallenge(uint64_t challengeID, const WebCore::AuthenticationChallenge&) const;
</del><ins>+ bool shouldCoalesceChallenge(uint64_t pageID, uint64_t challengeID, const WebCore::AuthenticationChallenge&) const;
</ins><span class="cx">
</span><span class="cx"> void useCredentialForSingleChallenge(uint64_t challengeID, const WebCore::Credential&, const WebCore::CertificateInfo&);
</span><span class="cx"> void continueWithoutCredentialForSingleChallenge(uint64_t challengeID);
</span></span></pre>
</div>
</div>
</body>
</html>