Changeset 91799 in webkit

Timestamp:

Jul 26, 2011 4:43:15 PM (13 years ago)

Author:

psolanki@apple.com

Message:

Add protection space authentication callback code to CFNetwork loader on Mac
​https://bugs.webkit.org/show_bug.cgi?id=65190
<rdar://problem/9842424>

Reviewed by Oliver Hunt.

Port over protection space authentication callback code from ResourceHandleMac.mm to
ResourceHandleCFNet.cpp.

• platform/network/ResourceHandle.h:
• platform/network/cf/ResourceHandleCFNet.cpp:

(WebCore::canRespondToProtectionSpace):
(WebCore::ResourceHandle::createCFURLConnection):
(WebCore::ResourceHandle::canAuthenticateAgainstProtectionSpace):
(WebCore::WebCoreSynchronousLoaderClient::canAuthenticateAgainstProtectionSpace):

• platform/network/mac/ResourceHandleMac.mm:

(-[WebCoreResourceHandleAsDelegate connection:canAuthenticateAgainstProtectionSpace:]): Add logging.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/ResourceHandle.h (modified) (2 diffs)
• platform/network/cf/ResourceHandleCFNet.cpp (modified) (5 diffs)
• platform/network/mac/ResourceHandleMac.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-26  Pratik Solanki  <psolanki@apple.com>
+
+        Add protection space authentication callback code to CFNetwork loader on Mac
+        https://bugs.webkit.org/show_bug.cgi?id=65190
+        <rdar://problem/9842424>
+
+        Reviewed by Oliver Hunt.
+
+        Port over protection space authentication callback code from ResourceHandleMac.mm to
+        ResourceHandleCFNet.cpp.
+
+        * platform/network/ResourceHandle.h:
+        * platform/network/cf/ResourceHandleCFNet.cpp:
+        (WebCore::canRespondToProtectionSpace):
+        (WebCore::ResourceHandle::createCFURLConnection):
+        (WebCore::ResourceHandle::canAuthenticateAgainstProtectionSpace):
+        (WebCore::WebCoreSynchronousLoaderClient::canAuthenticateAgainstProtectionSpace):
+        * platform/network/mac/ResourceHandleMac.mm:
+        (-[WebCoreResourceHandleAsDelegate connection:canAuthenticateAgainstProtectionSpace:]): Add logging.
+
 2011-07-26  Sadrul Habib Chowdhury  <sadrul@chromium.org>
 

trunk/Source/WebCore/platform/network/ResourceHandle.h

@@ -123 +123 @@
 #endif
 
-#if PLATFORM(MAC) && !USE(CFNETWORK)
-    void didCancelAuthenticationChallenge(const AuthenticationChallenge&);
+#if PLATFORM(MAC)
 #if USE(PROTECTION_SPACE_AUTH_CALLBACK)
     bool canAuthenticateAgainstProtectionSpace(const ProtectionSpace&);
 #endif
+#if !USE(CFNETWORK)
+    void didCancelAuthenticationChallenge(const AuthenticationChallenge&);
     NSURLConnection *connection() const;
     WebCoreResourceHandleAsDelegate *delegate();
@@ -134 +135 @@
 #endif
 
-#if PLATFORM(MAC)
     void schedule(SchedulePair*);
     void unschedule(SchedulePair*);

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

@@ -104 +104 @@
     virtual void didFinishLoading(ResourceHandle*, double /*finishTime*/);
     virtual void didFail(ResourceHandle*, const ResourceError&);
+#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
+    virtual bool canAuthenticateAgainstProtectionSpace(ResourceHandle*, const ProtectionSpace&);
+#endif
 
     bool m_allowStoredCredentials;
@@ -348 +351 @@
     handle->didReceiveAuthenticationChallenge(AuthenticationChallenge(challenge, handle));
 }
+
+#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
+static Boolean canRespondToProtectionSpace(CFURLConnectionRef conn, CFURLProtectionSpaceRef protectionSpace, const void* clientInfo)
+{
+#if LOG_DISABLED
+    UNUSED_PARAM(conn);
+#endif
+    ResourceHandle* handle = static_cast<ResourceHandle*>(const_cast<void*>(clientInfo));
+    ASSERT(handle);
+
+    LOG(Network, "CFNet - canRespondToProtectionSpace(conn=%p, handle=%p (%s)", conn, handle, handle->firstRequest().url().string().utf8().data());
+
+    return handle->canAuthenticateAgainstProtectionSpace(core(protectionSpace));
+}
+#endif
 
 ResourceHandleInternal::~ResourceHandleInternal()
@@ -459 +477 @@
     RetainPtr<CFURLRequestRef> request(AdoptCF, makeFinalRequest(firstRequest(), shouldContentSniff));
 
-#if HAVE(CFNETWORK_DATA_ARRAY_CALLBACK)
-    CFURLConnectionClient_V6 client = { 6, this, 0, 0, 0, WebCore::willSendRequest, didReceiveResponse, didReceiveData, 0, didFinishLoading, didFail, willCacheResponse, didReceiveChallenge, didSendBodyData, shouldUseCredentialStorageCallback, 0, 0, 0, didReceiveDataArray};
+#if HAVE(CFNETWORK_DATA_ARRAY_CALLBACK) && USE(PROTECTION_SPACE_AUTH_CALLBACK)
+    CFURLConnectionClient_V6 client = { 6, this, 0, 0, 0, WebCore::willSendRequest, didReceiveResponse, didReceiveData, 0, didFinishLoading, didFail, willCacheResponse, didReceiveChallenge, didSendBodyData, shouldUseCredentialStorageCallback, 0, canRespondToProtectionSpace, 0, didReceiveDataArray};
 #else
     CFURLConnectionClient_V3 client = { 3, this, 0, 0, 0, WebCore::willSendRequest, didReceiveResponse, didReceiveData, 0, didFinishLoading, didFail, willCacheResponse, didReceiveChallenge, didSendBodyData, shouldUseCredentialStorageCallback, 0};
@@ -597 +615 @@
 }
 
+#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
+bool ResourceHandle::canAuthenticateAgainstProtectionSpace(const ProtectionSpace& protectionSpace)
+{
+    if (client())
+        return client()->canAuthenticateAgainstProtectionSpace(this, protectionSpace);
+
+    return false;
+}
+#endif
+
 void ResourceHandle::receivedCredential(const AuthenticationChallenge& challenge, const Credential& credential)
 {
@@ -888 +916 @@
 }
 
+#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
+bool WebCoreSynchronousLoaderClient::canAuthenticateAgainstProtectionSpace(ResourceHandle*, const ProtectionSpace&)
+{
+    // FIXME: We should ask FrameLoaderClient. <http://webkit.org/b/65196>
+    return true;
+}
+#endif
+
 #endif // USE(CFNETWORK)
 

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

@@ -766 +766 @@
 
 #if USE(PROTECTION_SPACE_AUTH_CALLBACK)
-- (BOOL)connection:(NSURLConnection *)unusedConnection canAuthenticateAgainstProtectionSpace:(NSURLProtectionSpace *)protectionSpace
-{
-    UNUSED_PARAM(unusedConnection);
-    
+- (BOOL)connection:(NSURLConnection *)connection canAuthenticateAgainstProtectionSpace:(NSURLProtectionSpace *)protectionSpace
+{
+#if LOG_DISABLED
+    UNUSED_PARAM(connection);
+#endif
+
+    LOG(Network, "Handle %p delegate connection:%p canAuthenticateAgainstProtectionSpace:%p", m_handle, connection);
+
     if (!m_handle)
         return NO;
-        
+
     return m_handle->canAuthenticateAgainstProtectionSpace(core(protectionSpace));
 }
@@ -952 +956 @@
 bool WebCoreSynchronousLoaderClient::canAuthenticateAgainstProtectionSpace(ResourceHandle*, const ProtectionSpace&)
 {
-    // FIXME: We should ask FrameLoaderClient.
+    // FIXME: We should ask FrameLoaderClient. <http://webkit.org/b/65196>
     return true;
 }