Changeset 171858 in webkit

Timestamp:

Jul 31, 2014 9:43:06 AM (10 years ago)

Author:

mitz@apple.com

Message:

Source/WebCore: WebCore part of: Server trust authentication challenges aren’t sent to the navigation delegate
​https://bugs.webkit.org/show_bug.cgi?id=135327

Reviewed by Alexey Proskuryakov.

• platform/network/cf/ResourceHandleCFNet.cpp:

(WebCore::ResourceHandle::receivedCredential): Don’t try to change the persistence of
credentials used for server trust, because the platform doesn’t support persistence values
other than Session for server trust.

• platform/network/mac/ResourceHandleMac.mm:

(WebCore::ResourceHandle::receivedCredential): Ditto.

Source/WebKit2: WebKit part of: Server trust authentication challenges aren’t sent to the navigation delegate
​https://bugs.webkit.org/show_bug.cgi?id=135327

Reviewed by Alexey Proskuryakov.

• UIProcess/Cocoa/NavigationState.mm:

(WebKit::NavigationState::LoaderClient::canAuthenticateAgainstProtectionSpaceInFrame):
Return true for server trust protection spaces if the delegate implements
-webView:didReceiveAuthenticationChallenge:completionHandler:.
(WebKit::NavigationState::LoaderClient::didReceiveAuthenticationChallengeInFrame): Removed
an assertion that is no longer true due to the above.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/network/cf/ResourceHandleCFNet.cpp (modified) (1 diff)
• WebCore/platform/network/mac/ResourceHandleMac.mm (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/Cocoa/NavigationState.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-07-31  Dan Bernstein  <mitz@apple.com>
+
+        WebCore part of: Server trust authentication challenges aren’t sent to the navigation delegate
+        https://bugs.webkit.org/show_bug.cgi?id=135327
+
+        Reviewed by Alexey Proskuryakov.
+
+        * platform/network/cf/ResourceHandleCFNet.cpp:
+        (WebCore::ResourceHandle::receivedCredential): Don’t try to change the persistence of
+        credentials used for server trust, because the platform doesn’t support persistence values
+        other than Session for server trust.
+        * platform/network/mac/ResourceHandleMac.mm:
+        (WebCore::ResourceHandle::receivedCredential): Ditto.
+
 2014-07-31  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp

@@ -422 +422 @@
     }
 
-    if (credential.persistence() == CredentialPersistenceForSession) {
+    if (credential.persistence() == CredentialPersistenceForSession && challenge.protectionSpace().authenticationScheme() != ProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested) {
         // Manage per-session credentials internally, because once NSURLCredentialPersistencePerSession is used, there is no way
         // to ignore it for a particular request (short of removing it altogether).

trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm

@@ -651 +651 @@
     }
 
-    if (credential.persistence() == CredentialPersistenceForSession) {
+    if (credential.persistence() == CredentialPersistenceForSession && challenge.protectionSpace().authenticationScheme() != ProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested) {
         // Manage per-session credentials internally, because once NSURLCredentialPersistenceForSession is used, there is no way
         // to ignore it for a particular request (short of removing it altogether).

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-07-31  Dan Bernstein  <mitz@apple.com>
+
+        WebKit part of: Server trust authentication challenges aren’t sent to the navigation delegate
+        https://bugs.webkit.org/show_bug.cgi?id=135327
+
+        Reviewed by Alexey Proskuryakov.
+
+        * UIProcess/Cocoa/NavigationState.mm:
+        (WebKit::NavigationState::LoaderClient::canAuthenticateAgainstProtectionSpaceInFrame):
+        Return true for server trust protection spaces if the delegate implements
+        -webView:didReceiveAuthenticationChallenge:completionHandler:.
+        (WebKit::NavigationState::LoaderClient::didReceiveAuthenticationChallengeInFrame): Removed
+        an assertion that is no longer true due to the above.
+
 2014-07-31  Carlos Garcia Campos  <cgarcia@igalia.com>
 

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

@@ -692 +692 @@
 {
     if (m_navigationState.m_navigationDelegateMethods.webViewDidReceiveAuthenticationChallengeCompletionHandler)
-        return protectionSpace->authenticationScheme() != WebCore::ProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested;
+        return true;
 
     if (!m_navigationState.m_navigationDelegateMethods.webViewCanAuthenticateAgainstProtectionSpace)
@@ -708 +708 @@
 #if !defined(__MAC_OS_X_VERSION_MIN_REQUIRED) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
     if (m_navigationState.m_navigationDelegateMethods.webViewDidReceiveAuthenticationChallengeCompletionHandler) {
-        ASSERT(authenticationChallenge->protectionSpace()->authenticationScheme() != WebCore::ProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested);
         auto navigationDelegate = m_navigationState.m_navigationDelegate.get();
         if (!navigationDelegate) {