<!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>[206583] 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/206583">206583</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-29 08:30:33 -0700 (Thu, 29 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>NetworkSession: HTTP authentication doesn't work if PROTECTION_SPACE_AUTH_CALLBACK is not enabled
https://bugs.webkit.org/show_bug.cgi?id=162724
Reviewed by Alex Christensen.
NetworkLoad always expects continueCanAuthenticateAgainstProtectionSpace() to be called to complete the
authentication challenge, which is only defined when PROTECTION_SPACE_AUTH_CALLBACK is enabled.
I've added missing #ifdefs for PROTECTION_SPACE_AUTH_CALLBACK.
* NetworkProcess/Downloads/DownloadManager.cpp:
(WebKit::DownloadManager::continueCanAuthenticateAgainstProtectionSpace):
* NetworkProcess/Downloads/DownloadManager.h:
* NetworkProcess/Downloads/PendingDownload.cpp:
(WebKit::PendingDownload::continueCanAuthenticateAgainstProtectionSpace):
* NetworkProcess/Downloads/PendingDownload.h:
* NetworkProcess/NetworkLoad.cpp:
(WebKit::NetworkLoad::~NetworkLoad):
(WebKit::NetworkLoad::didReceiveChallenge): Call completeAuthenticationChallenge() instead of
canAuthenticateAgainstProtectionSpaceAsync() when PROTECTION_SPACE_AUTH_CALLBACK is not enabled.
(WebKit::NetworkLoad::completeAuthenticationChallenge): Moved common code to complete the authentication
challenge from continueCanAuthenticateAgainstProtectionSpace().
(WebKit::NetworkLoad::continueCanAuthenticateAgainstProtectionSpace): Call completeAuthenticationChallenge().
(WebKit::NetworkLoad::canAuthenticateAgainstProtectionSpaceAsync):
* NetworkProcess/NetworkLoad.h:
* NetworkProcess/NetworkLoadClient.h:
* NetworkProcess/NetworkProcess.cpp:
(WebKit::NetworkProcess::continueCanAuthenticateAgainstProtectionSpaceDownload):
* NetworkProcess/NetworkProcess.h:
* NetworkProcess/NetworkProcess.messages.in:
* NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::canAuthenticateAgainstProtectionSpaceAsync):
(WebKit::NetworkResourceLoader::continueCanAuthenticateAgainstProtectionSpace):
* NetworkProcess/NetworkResourceLoader.h:
* NetworkProcess/cache/NetworkCacheSpeculativeLoad.h:
* Shared/Authentication/AuthenticationManager.h:
* UIProcess/Downloads/DownloadProxy.cpp:
(WebKit::DownloadProxy::canAuthenticateAgainstProtectionSpace):
* UIProcess/Downloads/DownloadProxy.h:
* UIProcess/Downloads/DownloadProxy.messages.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsDownloadManagercpp">trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsDownloadManagerh">trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsPendingDownloadcpp">trunk/Source/WebKit2/NetworkProcess/Downloads/PendingDownload.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsPendingDownloadh">trunk/Source/WebKit2/NetworkProcess/Downloads/PendingDownload.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkLoadcpp">trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkLoadh">trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkLoadClienth">trunk/Source/WebKit2/NetworkProcess/NetworkLoadClient.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcesscpp">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessh">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessmessagesin">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoaderh">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAuthenticationAuthenticationManagerh">trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDownloadsDownloadProxycpp">trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDownloadsDownloadProxyh">trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDownloadsDownloadProxymessagesin">trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.messages.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (206582 => 206583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-09-29 15:28:54 UTC (rev 206582)
+++ trunk/Source/WebKit2/ChangeLog 2016-09-29 15:30:33 UTC (rev 206583)
</span><span class="lines">@@ -1,3 +1,45 @@
</span><ins>+2016-09-29 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ NetworkSession: HTTP authentication doesn't work if PROTECTION_SPACE_AUTH_CALLBACK is not enabled
+ https://bugs.webkit.org/show_bug.cgi?id=162724
+
+ Reviewed by Alex Christensen.
+
+ NetworkLoad always expects continueCanAuthenticateAgainstProtectionSpace() to be called to complete the
+ authentication challenge, which is only defined when PROTECTION_SPACE_AUTH_CALLBACK is enabled.
+ I've added missing #ifdefs for PROTECTION_SPACE_AUTH_CALLBACK.
+
+ * NetworkProcess/Downloads/DownloadManager.cpp:
+ (WebKit::DownloadManager::continueCanAuthenticateAgainstProtectionSpace):
+ * NetworkProcess/Downloads/DownloadManager.h:
+ * NetworkProcess/Downloads/PendingDownload.cpp:
+ (WebKit::PendingDownload::continueCanAuthenticateAgainstProtectionSpace):
+ * NetworkProcess/Downloads/PendingDownload.h:
+ * NetworkProcess/NetworkLoad.cpp:
+ (WebKit::NetworkLoad::~NetworkLoad):
+ (WebKit::NetworkLoad::didReceiveChallenge): Call completeAuthenticationChallenge() instead of
+ canAuthenticateAgainstProtectionSpaceAsync() when PROTECTION_SPACE_AUTH_CALLBACK is not enabled.
+ (WebKit::NetworkLoad::completeAuthenticationChallenge): Moved common code to complete the authentication
+ challenge from continueCanAuthenticateAgainstProtectionSpace().
+ (WebKit::NetworkLoad::continueCanAuthenticateAgainstProtectionSpace): Call completeAuthenticationChallenge().
+ (WebKit::NetworkLoad::canAuthenticateAgainstProtectionSpaceAsync):
+ * NetworkProcess/NetworkLoad.h:
+ * NetworkProcess/NetworkLoadClient.h:
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::continueCanAuthenticateAgainstProtectionSpaceDownload):
+ * NetworkProcess/NetworkProcess.h:
+ * NetworkProcess/NetworkProcess.messages.in:
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::canAuthenticateAgainstProtectionSpaceAsync):
+ (WebKit::NetworkResourceLoader::continueCanAuthenticateAgainstProtectionSpace):
+ * NetworkProcess/NetworkResourceLoader.h:
+ * NetworkProcess/cache/NetworkCacheSpeculativeLoad.h:
+ * Shared/Authentication/AuthenticationManager.h:
+ * UIProcess/Downloads/DownloadProxy.cpp:
+ (WebKit::DownloadProxy::canAuthenticateAgainstProtectionSpace):
+ * UIProcess/Downloads/DownloadProxy.h:
+ * UIProcess/Downloads/DownloadProxy.messages.in:
+
</ins><span class="cx"> 2016-09-28 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> WKSharedAPICast should not warn about acceptable custom context menu tag values
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp (206582 => 206583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp 2016-09-29 15:28:54 UTC (rev 206582)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp 2016-09-29 15:30:33 UTC (rev 206583)
</span><span class="lines">@@ -80,7 +80,8 @@
</span><span class="cx"> m_downloads.add(downloadID, WTFMove(download));
</span><span class="cx"> return std::make_pair(WTFMove(downloadAfterLocationDecided), WTFMove(pendingDownload));
</span><span class="cx"> }
</span><del>-
</del><ins>+
+#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
</ins><span class="cx"> void DownloadManager::continueCanAuthenticateAgainstProtectionSpace(DownloadID downloadID, bool canAuthenticate)
</span><span class="cx"> {
</span><span class="cx"> auto* pendingDownload = m_pendingDownloads.get(downloadID);
</span><span class="lines">@@ -88,6 +89,7 @@
</span><span class="cx"> if (pendingDownload)
</span><span class="cx"> pendingDownload->continueCanAuthenticateAgainstProtectionSpace(canAuthenticate);
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> void DownloadManager::continueWillSendRequest(DownloadID downloadID, WebCore::ResourceRequest&& request)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h (206582 => 206583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h 2016-09-29 15:28:54 UTC (rev 206582)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h 2016-09-29 15:30:33 UTC (rev 206583)
</span><span class="lines">@@ -75,7 +75,9 @@
</span><span class="cx"> void startDownload(WebCore::SessionID, DownloadID, const WebCore::ResourceRequest&, const String& suggestedName = { });
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><span class="cx"> std::pair<RefPtr<NetworkDataTask>, std::unique_ptr<PendingDownload>> dataTaskBecameDownloadTask(DownloadID, std::unique_ptr<Download>&&);
</span><ins>+#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
</ins><span class="cx"> void continueCanAuthenticateAgainstProtectionSpace(DownloadID, bool canAuthenticate);
</span><ins>+#endif
</ins><span class="cx"> void continueWillSendRequest(DownloadID, WebCore::ResourceRequest&&);
</span><span class="cx"> void willDecidePendingDownloadDestination(NetworkDataTask&, ResponseCompletionHandler&&);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsPendingDownloadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/PendingDownload.cpp (206582 => 206583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/PendingDownload.cpp 2016-09-29 15:28:54 UTC (rev 206582)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/PendingDownload.cpp 2016-09-29 15:30:33 UTC (rev 206583)
</span><span class="lines">@@ -56,6 +56,7 @@
</span><span class="cx"> m_networkLoad->continueWillSendRequest(WTFMove(newRequest));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
</ins><span class="cx"> void PendingDownload::canAuthenticateAgainstProtectionSpaceAsync(const WebCore::ProtectionSpace& protectionSpace)
</span><span class="cx"> {
</span><span class="cx"> send(Messages::DownloadProxy::CanAuthenticateAgainstProtectionSpace(protectionSpace));
</span><span class="lines">@@ -65,6 +66,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_networkLoad->continueCanAuthenticateAgainstProtectionSpace(canAuthenticate);
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> void PendingDownload::didBecomeDownload()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsPendingDownloadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/PendingDownload.h (206582 => 206583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/PendingDownload.h 2016-09-29 15:28:54 UTC (rev 206582)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/PendingDownload.h 2016-09-29 15:30:33 UTC (rev 206583)
</span><span class="lines">@@ -48,12 +48,16 @@
</span><span class="cx"> PendingDownload(NetworkLoadParameters&&, DownloadID, NetworkSession&, const String& suggestedName);
</span><span class="cx">
</span><span class="cx"> void continueWillSendRequest(WebCore::ResourceRequest&&);
</span><ins>+#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
</ins><span class="cx"> void continueCanAuthenticateAgainstProtectionSpace(bool canAuthenticate);
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> // NetworkLoadClient.
</span><span class="cx"> void didSendData(unsigned long long bytesSent, unsigned long long totalBytesToBeSent) override { }
</span><ins>+#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
</ins><span class="cx"> void canAuthenticateAgainstProtectionSpaceAsync(const WebCore::ProtectionSpace&) override;
</span><ins>+#endif
</ins><span class="cx"> bool isSynchronous() const override { return false; }
</span><span class="cx"> void willSendRedirectedRequest(WebCore::ResourceRequest&&, WebCore::ResourceRequest&& redirectRequest, WebCore::ResourceResponse&& redirectResponse) override;
</span><span class="cx"> ShouldContinueDidReceiveResponse didReceiveResponse(WebCore::ResourceResponse&&) override { return ShouldContinueDidReceiveResponse::No; };
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkLoadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp (206582 => 206583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2016-09-29 15:28:54 UTC (rev 206582)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2016-09-29 15:30:33 UTC (rev 206583)
</span><span class="lines">@@ -76,8 +76,10 @@
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><span class="cx"> if (m_responseCompletionHandler)
</span><span class="cx"> m_responseCompletionHandler(PolicyIgnore);
</span><ins>+#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
</ins><span class="cx"> if (m_challengeCompletionHandler)
</span><span class="cx"> m_challengeCompletionHandler(AuthenticationChallengeDisposition::Cancel, { });
</span><ins>+#endif
</ins><span class="cx"> if (m_task)
</span><span class="cx"> m_task->clearClient();
</span><span class="cx"> #elif USE(PROTECTION_SPACE_AUTH_CALLBACK)
</span><span class="lines">@@ -226,6 +228,7 @@
</span><span class="cx"> void NetworkLoad::didReceiveChallenge(const AuthenticationChallenge& challenge, ChallengeCompletionHandler&& completionHandler)
</span><span class="cx"> {
</span><span class="cx"> // Handle server trust evaluation at platform-level if requested, for performance reasons.
</span><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> if (challenge.protectionSpace().authenticationScheme() == ProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested
</span><span class="cx"> && !NetworkProcess::singleton().canHandleHTTPSServerTrustEvaluation()) {
</span><span class="cx"> if (m_task && m_task->allowsSpecificHTTPSCertificateForHost(challenge))
</span><span class="lines">@@ -234,13 +237,33 @@
</span><span class="cx"> completionHandler(AuthenticationChallengeDisposition::RejectProtectionSpace, { });
</span><span class="cx"> return;
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><ins>+ m_challenge = challenge;
+#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
</ins><span class="cx"> m_challengeCompletionHandler = WTFMove(completionHandler);
</span><del>- m_challenge = challenge;
-
</del><span class="cx"> m_client.canAuthenticateAgainstProtectionSpaceAsync(challenge.protectionSpace());
</span><ins>+#else
+ completeAuthenticationChallenge(WTFMove(completionHandler));
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void NetworkLoad::completeAuthenticationChallenge(ChallengeCompletionHandler&& completionHandler)
+{
+ if (m_parameters.clientCredentialPolicy == ClientCredentialPolicy::CannotAskClientForCredentials) {
+ completionHandler(AuthenticationChallengeDisposition::UseCredential, { });
+ return;
+ }
+
+ if (!m_task)
+ return;
+
+ if (auto* pendingDownload = m_task->pendingDownload())
+ NetworkProcess::singleton().authenticationManager().didReceiveAuthenticationChallenge(*pendingDownload, *m_challenge, WTFMove(completionHandler));
+ else
+ NetworkProcess::singleton().authenticationManager().didReceiveAuthenticationChallenge(m_parameters.webPageID, m_parameters.webFrameID, *m_challenge, WTFMove(completionHandler));
+}
+
</ins><span class="cx"> void NetworkLoad::didReceiveResponseNetworkSession(ResourceResponse&& response, ResponseCompletionHandler&& completionHandler)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="lines">@@ -364,17 +387,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_parameters.clientCredentialPolicy == ClientCredentialPolicy::CannotAskClientForCredentials) {
- completionHandler(AuthenticationChallengeDisposition::UseCredential, { });
- return;
- }
-
- if (m_task) {
- if (auto* pendingDownload = m_task->pendingDownload())
- NetworkProcess::singleton().authenticationManager().didReceiveAuthenticationChallenge(*pendingDownload, *m_challenge, WTFMove(completionHandler));
- else
- NetworkProcess::singleton().authenticationManager().didReceiveAuthenticationChallenge(m_parameters.webPageID, m_parameters.webFrameID, *m_challenge, WTFMove(completionHandler));
- }
</del><ins>+ completeAuthenticationChallenge(WTFMove(completionHandler));
</ins><span class="cx"> #else
</span><span class="cx"> m_waitingForContinueCanAuthenticateAgainstProtectionSpace = false;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkLoadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h (206582 => 206583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h 2016-09-29 15:28:54 UTC (rev 206582)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h 2016-09-29 15:30:33 UTC (rev 206583)
</span><span class="lines">@@ -123,6 +123,8 @@
</span><span class="cx"> void didSendData(uint64_t totalBytesSent, uint64_t totalBytesExpectedToSend) override;
</span><span class="cx"> void wasBlocked() override;
</span><span class="cx"> void cannotShowURL() override;
</span><ins>+
+ void completeAuthenticationChallenge(ChallengeCompletionHandler&&);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> NetworkLoadClient& m_client;
</span><span class="lines">@@ -130,7 +132,9 @@
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><span class="cx"> RefPtr<NetworkDataTask> m_task;
</span><span class="cx"> Optional<WebCore::AuthenticationChallenge> m_challenge;
</span><ins>+#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
</ins><span class="cx"> ChallengeCompletionHandler m_challengeCompletionHandler;
</span><ins>+#endif
</ins><span class="cx"> ResponseCompletionHandler m_responseCompletionHandler;
</span><span class="cx"> RedirectCompletionHandler m_redirectCompletionHandler;
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkLoadClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoadClient.h (206582 => 206583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoadClient.h 2016-09-29 15:28:54 UTC (rev 206582)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoadClient.h 2016-09-29 15:30:33 UTC (rev 206583)
</span><span class="lines">@@ -48,7 +48,9 @@
</span><span class="cx"> virtual bool isSynchronous() const = 0;
</span><span class="cx">
</span><span class="cx"> virtual void didSendData(unsigned long long bytesSent, unsigned long long totalBytesToBeSent) = 0;
</span><ins>+#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
</ins><span class="cx"> virtual void canAuthenticateAgainstProtectionSpaceAsync(const WebCore::ProtectionSpace&) = 0;
</span><ins>+#endif
</ins><span class="cx"> virtual void willSendRedirectedRequest(WebCore::ResourceRequest&&, WebCore::ResourceRequest&& redirectRequest, WebCore::ResourceResponse&& redirectResponse) = 0;
</span><span class="cx"> enum class ShouldContinueDidReceiveResponse { No, Yes };
</span><span class="cx"> virtual ShouldContinueDidReceiveResponse didReceiveResponse(WebCore::ResourceResponse&&) = 0;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (206582 => 206583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2016-09-29 15:28:54 UTC (rev 206582)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2016-09-29 15:30:33 UTC (rev 206583)
</span><span class="lines">@@ -501,10 +501,12 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><ins>+#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
</ins><span class="cx"> void NetworkProcess::continueCanAuthenticateAgainstProtectionSpaceDownload(DownloadID downloadID, bool canAuthenticate)
</span><span class="cx"> {
</span><span class="cx"> downloadManager().continueCanAuthenticateAgainstProtectionSpace(downloadID, canAuthenticate);
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> void NetworkProcess::continueWillSendRequest(DownloadID downloadID, WebCore::ResourceRequest&& request)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (206582 => 206583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2016-09-29 15:28:54 UTC (rev 206582)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2016-09-29 15:30:33 UTC (rev 206583)
</span><span class="lines">@@ -177,7 +177,9 @@
</span><span class="cx"> void continueCanAuthenticateAgainstProtectionSpace(uint64_t resourceLoadIdentifier, bool canAuthenticate);
</span><span class="cx"> #endif
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><ins>+#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
</ins><span class="cx"> void continueCanAuthenticateAgainstProtectionSpaceDownload(DownloadID, bool canAuthenticate);
</span><ins>+#endif
</ins><span class="cx"> void continueWillSendRequest(DownloadID, WebCore::ResourceRequest&&);
</span><span class="cx"> #endif
</span><span class="cx"> void continueDecidePendingDownloadDestination(DownloadID, String destination, const SandboxExtension::Handle& sandboxExtensionHandle, bool allowOverwrite);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in (206582 => 206583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in 2016-09-29 15:28:54 UTC (rev 206582)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in 2016-09-29 15:30:33 UTC (rev 206583)
</span><span class="lines">@@ -49,7 +49,9 @@
</span><span class="cx"> ContinueCanAuthenticateAgainstProtectionSpace(uint64_t loaderID, bool canAuthenticate)
</span><span class="cx"> #endif
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><ins>+#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
</ins><span class="cx"> ContinueCanAuthenticateAgainstProtectionSpaceDownload(WebKit::DownloadID downloadID, bool canAuthenticate)
</span><ins>+#endif
</ins><span class="cx"> ContinueWillSendRequest(WebKit::DownloadID downloadID, WebCore::ResourceRequest request)
</span><span class="cx"> #endif
</span><span class="cx"> ContinueDecidePendingDownloadDestination(WebKit::DownloadID downloadID, String destination, WebKit::SandboxExtension::Handle sandboxExtensionHandle, bool allowOverwrite)
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (206582 => 206583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2016-09-29 15:28:54 UTC (rev 206582)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2016-09-29 15:30:33 UTC (rev 206583)
</span><span class="lines">@@ -648,16 +648,12 @@
</span><span class="cx"> m_fileReferences.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
</ins><span class="cx"> void NetworkResourceLoader::canAuthenticateAgainstProtectionSpaceAsync(const ProtectionSpace& protectionSpace)
</span><span class="cx"> {
</span><del>-#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
</del><span class="cx"> NetworkProcess::singleton().canAuthenticateAgainstProtectionSpace(*this, protectionSpace);
</span><del>-#else
- UNUSED_PARAM(protectionSpace);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
</del><span class="cx"> void NetworkResourceLoader::continueCanAuthenticateAgainstProtectionSpace(bool result)
</span><span class="cx"> {
</span><span class="cx"> if (m_networkLoad)
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h (206582 => 206583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2016-09-29 15:28:54 UTC (rev 206582)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2016-09-29 15:30:33 UTC (rev 206583)
</span><span class="lines">@@ -86,7 +86,9 @@
</span><span class="cx">
</span><span class="cx"> // NetworkLoadClient.
</span><span class="cx"> void didSendData(unsigned long long bytesSent, unsigned long long totalBytesToBeSent) override;
</span><ins>+#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
</ins><span class="cx"> void canAuthenticateAgainstProtectionSpaceAsync(const WebCore::ProtectionSpace&) override;
</span><ins>+#endif
</ins><span class="cx"> bool isSynchronous() const override;
</span><span class="cx"> void willSendRedirectedRequest(WebCore::ResourceRequest&&, WebCore::ResourceRequest&& redirectRequest, WebCore::ResourceResponse&&) override;
</span><span class="cx"> ShouldContinueDidReceiveResponse didReceiveResponse(WebCore::ResourceResponse&&) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.h (206582 => 206583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.h 2016-09-29 15:28:54 UTC (rev 206582)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.h 2016-09-29 15:30:33 UTC (rev 206583)
</span><span class="lines">@@ -54,7 +54,9 @@
</span><span class="cx"> private:
</span><span class="cx"> // NetworkLoadClient.
</span><span class="cx"> void didSendData(unsigned long long bytesSent, unsigned long long totalBytesToBeSent) override { }
</span><ins>+#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
</ins><span class="cx"> void canAuthenticateAgainstProtectionSpaceAsync(const WebCore::ProtectionSpace&) override { }
</span><ins>+#endif
</ins><span class="cx"> bool isSynchronous() const override { return false; }
</span><span class="cx"> void willSendRedirectedRequest(WebCore::ResourceRequest&&, WebCore::ResourceRequest&& redirectRequest, WebCore::ResourceResponse&& redirectResponse) override;
</span><span class="cx"> ShouldContinueDidReceiveResponse didReceiveResponse(WebCore::ResourceResponse&&) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAuthenticationAuthenticationManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.h (206582 => 206583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.h 2016-09-29 15:28:54 UTC (rev 206582)
+++ trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.h 2016-09-29 15:30:33 UTC (rev 206583)
</span><span class="lines">@@ -58,8 +58,10 @@
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><span class="cx"> void didReceiveAuthenticationChallenge(uint64_t pageID, uint64_t frameID, const WebCore::AuthenticationChallenge&, ChallengeCompletionHandler&&);
</span><span class="cx"> void didReceiveAuthenticationChallenge(PendingDownload&, const WebCore::AuthenticationChallenge&, ChallengeCompletionHandler&&);
</span><ins>+#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
</ins><span class="cx"> void continueCanAuthenticateAgainstProtectionSpace(DownloadID, bool canAuthenticate);
</span><span class="cx"> #endif
</span><ins>+#endif
</ins><span class="cx"> // Called for resources in the WebProcess (NetworkProcess disabled)
</span><span class="cx"> void didReceiveAuthenticationChallenge(WebFrame*, const WebCore::AuthenticationChallenge&);
</span><span class="cx"> // Called for resources in the NetworkProcess (NetworkProcess enabled)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDownloadsDownloadProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp (206582 => 206583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp 2016-09-29 15:28:54 UTC (rev 206582)
+++ trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp 2016-09-29 15:30:33 UTC (rev 206583)
</span><span class="lines">@@ -113,6 +113,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><ins>+#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
</ins><span class="cx"> void DownloadProxy::canAuthenticateAgainstProtectionSpace(const ProtectionSpace& protectionSpace)
</span><span class="cx"> {
</span><span class="cx"> if (!m_processPool)
</span><span class="lines">@@ -126,6 +127,7 @@
</span><span class="cx">
</span><span class="cx"> networkProcessProxy->connection()->send(Messages::NetworkProcess::ContinueCanAuthenticateAgainstProtectionSpaceDownload(m_downloadID, result), 0);
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> void DownloadProxy::willSendRequest(const ResourceRequest& proposedRequest, const ResourceResponse& redirectResponse)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDownloadsDownloadProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.h (206582 => 206583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.h 2016-09-29 15:28:54 UTC (rev 206582)
+++ trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.h 2016-09-29 15:30:33 UTC (rev 206583)
</span><span class="lines">@@ -87,7 +87,9 @@
</span><span class="cx"> void didFail(const WebCore::ResourceError&, const IPC::DataReference& resumeData);
</span><span class="cx"> void didCancel(const IPC::DataReference& resumeData);
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><ins>+#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
</ins><span class="cx"> void canAuthenticateAgainstProtectionSpace(const WebCore::ProtectionSpace&);
</span><ins>+#endif
</ins><span class="cx"> void willSendRequest(const WebCore::ResourceRequest& redirectRequest, const WebCore::ResourceResponse& redirectResponse);
</span><span class="cx"> #else
</span><span class="cx"> void decideDestinationWithSuggestedFilename(const String& filename, String& destination, bool& allowOverwrite, SandboxExtension::Handle& sandboxExtensionHandle);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDownloadsDownloadProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.messages.in (206582 => 206583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.messages.in 2016-09-29 15:28:54 UTC (rev 206582)
+++ trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.messages.in 2016-09-29 15:30:33 UTC (rev 206583)
</span><span class="lines">@@ -24,9 +24,11 @@
</span><span class="cx"> DidStart(WebCore::ResourceRequest request, AtomicString suggestedFilename)
</span><span class="cx"> DidReceiveAuthenticationChallenge(WebCore::AuthenticationChallenge challenge, uint64_t challengeID)
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><del>- WillSendRequest(WebCore::ResourceRequest redirectRequest, WebCore::ResourceResponse redirectResponse));
</del><ins>+ WillSendRequest(WebCore::ResourceRequest redirectRequest, WebCore::ResourceResponse redirectResponse))
+#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
</ins><span class="cx"> CanAuthenticateAgainstProtectionSpace(WebCore::ProtectionSpace protectionSpace)
</span><span class="cx"> #endif
</span><ins>+#endif
</ins><span class="cx"> DecideDestinationWithSuggestedFilenameAsync(WebKit::DownloadID downloadID, String suggestedFilename)
</span><span class="cx">
</span><span class="cx"> DidReceiveResponse(WebCore::ResourceResponse response)
</span></span></pre>
</div>
</div>
</body>
</html>