<!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>[187367] trunk/Source/WebCore</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/187367">187367</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2015-07-24 15:43:42 -0700 (Fri, 24 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Cocoa] Clean up server trust handling in ResourceHandle.
https://bugs.webkit.org/show_bug.cgi?id=147277
rdar://problem/21394410
Reviewed by Brady Eidson.
* platform/network/ProtectionSpaceBase.h: (WebCore::ProtectionSpaceBase::isPasswordBased):
* platform/network/ProtectionSpaceBase.cpp: (WebCore::ProtectionSpaceBase::isPasswordBased):
Added. This is somewhat weak, as authentication schemes could change, but I couldn't find
any better way.
* platform/network/ResourceHandle.h:
* platform/network/cf/ResourceHandleCFNet.cpp:
(WebCore::ResourceHandle::didReceiveAuthenticationChallenge):
(WebCore::ResourceHandle::tryHandlePasswordBasedAuthentication):
* platform/network/mac/ResourceHandleMac.mm:
(WebCore::ResourceHandle::didReceiveAuthenticationChallenge):
(WebCore::ResourceHandle::tryHandlePasswordBasedAuthentication):
Factored out password handling, and made sure to not try that for server trust.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkProtectionSpaceBasecpp">trunk/Source/WebCore/platform/network/ProtectionSpaceBase.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkProtectionSpaceBaseh">trunk/Source/WebCore/platform/network/ProtectionSpaceBase.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceHandleh">trunk/Source/WebCore/platform/network/ResourceHandle.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceHandleCFNetcpp">trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacResourceHandleMacmm">trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (187366 => 187367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-24 22:25:52 UTC (rev 187366)
+++ trunk/Source/WebCore/ChangeLog 2015-07-24 22:43:42 UTC (rev 187367)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-07-24 Alexey Proskuryakov <ap@apple.com>
+
+ [Cocoa] Clean up server trust handling in ResourceHandle.
+ https://bugs.webkit.org/show_bug.cgi?id=147277
+ rdar://problem/21394410
+
+ Reviewed by Brady Eidson.
+
+ * platform/network/ProtectionSpaceBase.h: (WebCore::ProtectionSpaceBase::isPasswordBased):
+ * platform/network/ProtectionSpaceBase.cpp: (WebCore::ProtectionSpaceBase::isPasswordBased):
+ Added. This is somewhat weak, as authentication schemes could change, but I couldn't find
+ any better way.
+
+ * platform/network/ResourceHandle.h:
+ * platform/network/cf/ResourceHandleCFNet.cpp:
+ (WebCore::ResourceHandle::didReceiveAuthenticationChallenge):
+ (WebCore::ResourceHandle::tryHandlePasswordBasedAuthentication):
+ * platform/network/mac/ResourceHandleMac.mm:
+ (WebCore::ResourceHandle::didReceiveAuthenticationChallenge):
+ (WebCore::ResourceHandle::tryHandlePasswordBasedAuthentication):
+ Factored out password handling, and made sure to not try that for server trust.
+
</ins><span class="cx"> 2015-07-24 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS]: Inline video controls are blurry on scaled-down pages on non-retina devices.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkProtectionSpaceBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ProtectionSpaceBase.cpp (187366 => 187367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ProtectionSpaceBase.cpp 2015-07-24 22:25:52 UTC (rev 187366)
+++ trunk/Source/WebCore/platform/network/ProtectionSpaceBase.cpp 2015-07-24 22:43:42 UTC (rev 187367)
</span><span class="lines">@@ -100,6 +100,24 @@
</span><span class="cx"> m_authenticationScheme == ProtectionSpaceAuthenticationSchemeHTTPDigest);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool ProtectionSpaceBase::isPasswordBased() const
+{
+ switch (m_authenticationScheme) {
+ case ProtectionSpaceAuthenticationSchemeDefault:
+ case ProtectionSpaceAuthenticationSchemeHTTPBasic:
+ case ProtectionSpaceAuthenticationSchemeHTTPDigest:
+ case ProtectionSpaceAuthenticationSchemeHTMLForm:
+ case ProtectionSpaceAuthenticationSchemeNTLM:
+ case ProtectionSpaceAuthenticationSchemeNegotiate:
+ return true;
+ case ProtectionSpaceAuthenticationSchemeClientCertificateRequested:
+ case ProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested:
+ case ProtectionSpaceAuthenticationSchemeUnknown:
+ return false;
+ }
+}
+
+
</ins><span class="cx"> bool ProtectionSpaceBase::compare(const ProtectionSpace& a, const ProtectionSpace& b)
</span><span class="cx"> {
</span><span class="cx"> if (a.host() != b.host())
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkProtectionSpaceBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ProtectionSpaceBase.h (187366 => 187367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ProtectionSpaceBase.h 2015-07-24 22:25:52 UTC (rev 187366)
+++ trunk/Source/WebCore/platform/network/ProtectionSpaceBase.h 2015-07-24 22:43:42 UTC (rev 187367)
</span><span class="lines">@@ -68,6 +68,7 @@
</span><span class="cx"> WEBCORE_EXPORT ProtectionSpaceAuthenticationScheme authenticationScheme() const;
</span><span class="cx">
</span><span class="cx"> bool receivesCredentialSecurely() const;
</span><ins>+ bool isPasswordBased() const;
</ins><span class="cx">
</span><span class="cx"> bool encodingRequiresPlatformData() const { return false; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceHandle.h (187366 => 187367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceHandle.h 2015-07-24 22:25:52 UTC (rev 187366)
+++ trunk/Source/WebCore/platform/network/ResourceHandle.h 2015-07-24 22:43:42 UTC (rev 187367)
</span><span class="lines">@@ -118,6 +118,10 @@
</span><span class="cx"> virtual void receivedChallengeRejection(const AuthenticationChallenge&) override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(COCOA) || USE(CFNETWORK)
+ bool tryHandlePasswordBasedAuthentication(const AuthenticationChallenge&);
+#endif
+
</ins><span class="cx"> #if PLATFORM(COCOA) && USE(PROTECTION_SPACE_AUTH_CALLBACK)
</span><span class="cx"> bool canAuthenticateAgainstProtectionSpace(const ProtectionSpace&);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceHandleCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp (187366 => 187367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2015-07-24 22:25:52 UTC (rev 187366)
+++ trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2015-07-24 22:43:42 UTC (rev 187367)
</span><span class="lines">@@ -347,6 +347,24 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ if (tryHandlePasswordBasedAuthentication(challenge))
+ return;
+
+ d->m_currentWebChallenge = challenge;
+
+ if (client())
+ client()->didReceiveAuthenticationChallenge(this, d->m_currentWebChallenge);
+ else {
+ clearAuthentication();
+ CFURLConnectionPerformDefaultHandlingForChallenge(d->m_connection.get(), challenge.cfURLAuthChallengeRef());
+ }
+}
+
+bool ResourceHandle::tryHandlePasswordBasedAuthentication(const AuthenticationChallenge& challenge)
+{
+ if (!challenge.protectionSpace().isPasswordBased())
+ return false;
+
</ins><span class="cx"> if (!d->m_user.isNull() && !d->m_pass.isNull()) {
</span><span class="cx"> RetainPtr<CFURLCredentialRef> cfCredential = adoptCF(CFURLCredentialCreate(kCFAllocatorDefault, d->m_user.createCFString().get(), d->m_pass.createCFString().get(), 0, kCFURLCredentialPersistenceNone));
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="lines">@@ -364,7 +382,7 @@
</span><span class="cx"> d->m_user = String();
</span><span class="cx"> d->m_pass = String();
</span><span class="cx"> // FIXME: Per the specification, the user shouldn't be asked for credentials if there were incorrect ones provided explicitly.
</span><del>- return;
</del><ins>+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!client() || client()->shouldUseCredentialStorage(this)) {
</span><span class="lines">@@ -389,15 +407,12 @@
</span><span class="cx"> RetainPtr<CFURLCredentialRef> cfCredential = adoptCF(createCF(credential));
</span><span class="cx"> CFURLConnectionUseCredential(d->m_connection.get(), cfCredential.get(), challenge.cfURLAuthChallengeRef());
</span><span class="cx"> #endif
</span><del>- return;
</del><ins>+ return true;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- d->m_currentWebChallenge = challenge;
-
- if (client())
- client()->didReceiveAuthenticationChallenge(this, d->m_currentWebChallenge);
</del><ins>+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(PROTECTION_SPACE_AUTH_CALLBACK)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacResourceHandleMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm (187366 => 187367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2015-07-24 22:25:52 UTC (rev 187366)
+++ trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2015-07-24 22:43:42 UTC (rev 187367)
</span><span class="lines">@@ -542,6 +542,42 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (tryHandlePasswordBasedAuthentication(challenge))
+ return;
+
+#if PLATFORM(IOS)
+ // If the challenge is for a proxy protection space, look for default credentials in
+ // the keychain. CFNetwork used to handle this until WebCore was changed to always
+ // return NO to -connectionShouldUseCredentialStorage: for <rdar://problem/7704943>.
+ if (!challenge.previousFailureCount() && challenge.protectionSpace().isProxy()) {
+ NSURLAuthenticationChallenge *macChallenge = mac(challenge);
+ if (NSURLCredential *credential = [[NSURLCredentialStorage sharedCredentialStorage] defaultCredentialForProtectionSpace:[macChallenge protectionSpace]]) {
+ [challenge.sender() useCredential:credential forAuthenticationChallenge:macChallenge];
+ return;
+ }
+ }
+#endif // PLATFORM(IOS)
+
+ d->m_currentMacChallenge = challenge.nsURLAuthenticationChallenge();
+ d->m_currentWebChallenge = core(d->m_currentMacChallenge);
+ d->m_currentWebChallenge.setAuthenticationClient(this);
+
+ // FIXME: Several concurrent requests can return with the an authentication challenge for the same protection space.
+ // We should avoid making additional client calls for the same protection space when already waiting for the user,
+ // because typing the same credentials several times is annoying.
+ if (client())
+ client()->didReceiveAuthenticationChallenge(this, d->m_currentWebChallenge);
+ else {
+ clearAuthentication();
+ [challenge.sender() performDefaultHandlingForAuthenticationChallenge:challenge.nsURLAuthenticationChallenge()];
+ }
+}
+
+bool ResourceHandle::tryHandlePasswordBasedAuthentication(const AuthenticationChallenge& challenge)
+{
+ if (!challenge.protectionSpace().isPasswordBased())
+ return false;
+
</ins><span class="cx"> if (!d->m_user.isNull() && !d->m_pass.isNull()) {
</span><span class="cx"> NSURLCredential *credential = [[NSURLCredential alloc] initWithUser:d->m_user
</span><span class="cx"> password:d->m_pass
</span><span class="lines">@@ -553,7 +589,7 @@
</span><span class="cx"> // FIXME: Per the specification, the user shouldn't be asked for credentials if there were incorrect ones provided explicitly.
</span><span class="cx"> d->m_user = String();
</span><span class="cx"> d->m_pass = String();
</span><del>- return;
</del><ins>+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: Do not use the sync version of shouldUseCredentialStorage when the client returns true from usesAsyncCallbacks.
</span><span class="lines">@@ -574,33 +610,12 @@
</span><span class="cx"> d->m_context->storageSession().credentialStorage().set(credential, challenge.protectionSpace(), challenge.failureResponse().url());
</span><span class="cx"> }
</span><span class="cx"> [challenge.sender() useCredential:credential.nsCredential() forAuthenticationChallenge:mac(challenge)];
</span><del>- return;
</del><ins>+ return true;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- // If the challenge is for a proxy protection space, look for default credentials in
- // the keychain. CFNetwork used to handle this until WebCore was changed to always
- // return NO to -connectionShouldUseCredentialStorage: for <rdar://problem/7704943>.
- if (!challenge.previousFailureCount() && challenge.protectionSpace().isProxy()) {
- NSURLAuthenticationChallenge *macChallenge = mac(challenge);
- if (NSURLCredential *credential = [[NSURLCredentialStorage sharedCredentialStorage] defaultCredentialForProtectionSpace:[macChallenge protectionSpace]]) {
- [challenge.sender() useCredential:credential forAuthenticationChallenge:macChallenge];
- return;
- }
- }
-#endif // PLATFORM(IOS)
-
- d->m_currentMacChallenge = challenge.nsURLAuthenticationChallenge();
- d->m_currentWebChallenge = core(d->m_currentMacChallenge);
- d->m_currentWebChallenge.setAuthenticationClient(this);
-
- // FIXME: Several concurrent requests can return with the an authentication challenge for the same protection space.
- // We should avoid making additional client calls for the same protection space when already waiting for the user,
- // because typing the same credentials several times is annoying.
- if (client())
- client()->didReceiveAuthenticationChallenge(this, d->m_currentWebChallenge);
</del><ins>+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResourceHandle::didCancelAuthenticationChallenge(const AuthenticationChallenge& challenge)
</span><span class="lines">@@ -617,6 +632,7 @@
</span><span class="cx"> bool ResourceHandle::canAuthenticateAgainstProtectionSpace(const ProtectionSpace& protectionSpace)
</span><span class="cx"> {
</span><span class="cx"> if (client()->usesAsyncCallbacks()) {
</span><ins>+ // FIXME: This check for client() being null makes no sense.
</ins><span class="cx"> if (client())
</span><span class="cx"> client()->canAuthenticateAgainstProtectionSpaceAsync(this, protectionSpace);
</span><span class="cx"> else
</span></span></pre>
</div>
</div>
</body>
</html>