Changeset 99800 in webkit

Timestamp:

Nov 9, 2011, 6:48:40 PM (15 years ago)

Author:

ap@apple.com

Message:

<rdar://problem/10423024> WebProcess doesn't use AuthBrokerAgent for proxy credentials
​https://bugs.webkit.org/show_bug.cgi?id=71964

Reviewed by Darin Adler.

Source/WebCore:

• platform/network/cf/ResourceHandleCFNet.cpp: (WebCore::ResourceHandle::didReceiveAuthenticationChallenge):
• platform/network/mac/ResourceHandleMac.mm: (WebCore::ResourceHandle::didReceiveAuthenticationChallenge):

Don't ask the client for proxy credentials. CFNetwork results are authoritative, and proxy
credentials are system-wide.

Source/WebKit2:

• WebProcess/com.apple.WebProcess.sb: Allow mach-lookup of com.apple.cfnetwork.AuthBrokerAgent.

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) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/com.apple.WebProcess.sb (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-09  Alexey Proskuryakov  <ap@apple.com>
+
+        <rdar://problem/10423024> WebProcess doesn't use AuthBrokerAgent for proxy credentials
+        https://bugs.webkit.org/show_bug.cgi?id=71964
+
+        Reviewed by Darin Adler.
+
+        * platform/network/cf/ResourceHandleCFNet.cpp: (WebCore::ResourceHandle::didReceiveAuthenticationChallenge):
+        * platform/network/mac/ResourceHandleMac.mm: (WebCore::ResourceHandle::didReceiveAuthenticationChallenge):
+        Don't ask the client for proxy credentials. CFNetwork results are authoritative, and proxy
+        credentials are system-wide.
+
 2011-11-09  Daniel Sievers  <sievers@chromium.org>
 

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

@@ -578 +578 @@
     ASSERT(challenge.authenticationClient() == this); // Should be already set.
 
+#if !PLATFORM(WIN)
+    // Proxy authentication is handled by CFNetwork internally. We can get here if the user cancels
+    // CFNetwork authentication dialog, and we shouldn't ask the client to display another one in that case.
+    if (challenge.protectionSpace().isProxy()) {
+        // Cannot use receivedRequestToContinueWithoutCredential(), because current challenge is not yet set.
+        CFURLConnectionUseCredential(d->m_connection.get(), 0, challenge.cfURLAuthChallengeRef());
+        return;
+    }
+#endif
+
     if (!d->m_user.isNull() && !d->m_pass.isNull()) {
         RetainPtr<CFStringRef> user(AdoptCF, d->m_user.createCFString());

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

@@ -525 +525 @@
     ASSERT(challenge.nsURLAuthenticationChallenge());
 
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOWLEOPARD)
+    // Proxy authentication is handled by CFNetwork internally. We can get here if the user cancels
+    // CFNetwork authentication dialog, and we shouldn't ask the client to display another one in that case.
+    if (challenge.protectionSpace().isProxy()) {
+        // Cannot use receivedRequestToContinueWithoutCredential(), because current challenge is not yet set.
+        [challenge.sender() continueWithoutCredentialForAuthenticationChallenge:challenge.nsURLAuthenticationChallenge()];
+        return;
+    }
+#endif
+
     if (!d->m_user.isNull() && !d->m_pass.isNull()) {
         NSURLCredential *credential = [[NSURLCredential alloc] initWithUser:d->m_user
@@ -565 +575 @@
     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);

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-11-09  Alexey Proskuryakov  <ap@apple.com>
+
+        <rdar://problem/10423024> WebProcess doesn't use AuthBrokerAgent for proxy credentials
+        https://bugs.webkit.org/show_bug.cgi?id=71964
+
+        Reviewed by Darin Adler.
+
+        * WebProcess/com.apple.WebProcess.sb: Allow mach-lookup of com.apple.cfnetwork.AuthBrokerAgent.
+
 2011-11-09  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb

@@ -168 +168 @@
        (global-name "com.apple.windowserver.active")
 
+        ;; FIXME: This will be superfluous once <rdar://problem/10420555> is fixed.
+       (global-name "com.apple.cfnetwork.AuthBrokerAgent")
+
        ;; FIXME: This should be removed when <rdar://problem/9276393> is fixed.
        (global-name "com.apple.metadata.mds"))