Changeset 259521 in webkit

Timestamp:

Apr 3, 2020 4:45:58 PM (4 years ago)

Author:

commit-queue@webkit.org

Message:

Use AuthenticationChallenge instead of AuthenticationChallengeProxy for ResourceLoadDelegate
​https://bugs.webkit.org/show_bug.cgi?id=207639

Patch by Alex Christensen <​achristensen@webkit.org> on 2020-04-03
Reviewed by David Kilzer.

In r254345 my younger and more naive self used AuthenticationChallengeProxy instead of AuthenticationChallenge
because he didn't know about the WebCore::mac function, which is called by AuthenticationChallengeProxy, and it's
all I needed to get an NSURLAuthenticationChallenge. Skipping the AuthenticationChallengeProxy step cleans up
AuthenticationChallengeProxy by removing the unnecessary ability to have a null CompletionHandler.

Covered by existing tests.

• UIProcess/API/APIResourceLoadClient.h:
• UIProcess/Authentication/AuthenticationChallengeProxy.cpp:

(WebKit::AuthenticationChallengeProxy::AuthenticationChallengeProxy):
(): Deleted.

• UIProcess/Cocoa/ResourceLoadDelegate.h:
• UIProcess/Cocoa/ResourceLoadDelegate.mm:

(WebKit::ResourceLoadDelegate::ResourceLoadClient::didReceiveChallenge const):

• UIProcess/Network/NetworkProcessProxy.cpp:

(WebKit::NetworkProcessProxy::resourceLoadDidReceiveChallenge):

• UIProcess/WebPageProxy.cpp:
• UIProcess/WebPageProxy.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/APIResourceLoadClient.h (modified) (2 diffs)
• UIProcess/Authentication/AuthenticationChallengeProxy.cpp (modified) (2 diffs)
• UIProcess/Cocoa/ResourceLoadDelegate.h (modified) (1 diff)
• UIProcess/Cocoa/ResourceLoadDelegate.mm (modified) (3 diffs)
• UIProcess/Network/NetworkProcessProxy.cpp (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (1 diff)
• UIProcess/WebPageProxy.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-04-03  Alex Christensen  <achristensen@webkit.org>
+
+        Use AuthenticationChallenge instead of AuthenticationChallengeProxy for ResourceLoadDelegate
+        https://bugs.webkit.org/show_bug.cgi?id=207639
+
+        Reviewed by David Kilzer.
+
+        In r254345 my younger and more naive self used AuthenticationChallengeProxy instead of AuthenticationChallenge
+        because he didn't know about the WebCore::mac function, which is called by AuthenticationChallengeProxy, and it's
+        all I needed to get an NSURLAuthenticationChallenge.  Skipping the AuthenticationChallengeProxy step cleans up
+        AuthenticationChallengeProxy by removing the unnecessary ability to have a null CompletionHandler.
+
+        Covered by existing tests.
+
+        * UIProcess/API/APIResourceLoadClient.h:
+        * UIProcess/Authentication/AuthenticationChallengeProxy.cpp:
+        (WebKit::AuthenticationChallengeProxy::AuthenticationChallengeProxy):
+        (): Deleted.
+        * UIProcess/Cocoa/ResourceLoadDelegate.h:
+        * UIProcess/Cocoa/ResourceLoadDelegate.mm:
+        (WebKit::ResourceLoadDelegate::ResourceLoadClient::didReceiveChallenge const):
+        * UIProcess/Network/NetworkProcessProxy.cpp:
+        (WebKit::NetworkProcessProxy::resourceLoadDidReceiveChallenge):
+        * UIProcess/WebPageProxy.cpp:
+        * UIProcess/WebPageProxy.h:
+
 2020-04-03  Kate Cheney  <katherine_cheney@apple.com>
 

trunk/Source/WebKit/UIProcess/API/APIResourceLoadClient.h

@@ -30 +30 @@
 #include <WebCore/ResourceResponse.h>
 
+namespace WebCore {
+class AuthenticationChallenge;
+}
+
 namespace WebKit {
-class AuthenticationChallengeProxy;
 struct ResourceLoadInfo;
 }
@@ -43 +46 @@
     virtual void didSendRequest(WebKit::ResourceLoadInfo&&, WebCore::ResourceRequest&&) const = 0;
     virtual void didPerformHTTPRedirection(WebKit::ResourceLoadInfo&&, WebCore::ResourceResponse&&, WebCore::ResourceRequest&&) const = 0;
-    virtual void didReceiveChallenge(WebKit::ResourceLoadInfo&&, WebKit::AuthenticationChallengeProxy&) const = 0;
+    virtual void didReceiveChallenge(WebKit::ResourceLoadInfo&&, WebCore::AuthenticationChallenge&&) const = 0;
     virtual void didReceiveResponse(WebKit::ResourceLoadInfo&&, WebCore::ResourceResponse&&) const = 0;
     virtual void didCompleteWithError(WebKit::ResourceLoadInfo&&, WebCore::ResourceResponse&&, WebCore::ResourceError&&) const = 0;

trunk/Source/WebKit/UIProcess/Authentication/AuthenticationChallengeProxy.cpp

@@ -46 +46 @@
 AuthenticationChallengeProxy::AuthenticationChallengeProxy(WebCore::AuthenticationChallenge&& authenticationChallenge, uint64_t challengeID, Ref<IPC::Connection>&& connection, WeakPtr<SecKeyProxyStore>&& secKeyProxyStore)
     : m_coreAuthenticationChallenge(WTFMove(authenticationChallenge))
-    , m_listener(AuthenticationDecisionListener::create(challengeID ? CompletionHandler<void(AuthenticationChallengeDisposition, const WebCore::Credential&)>([challengeID, connection = WTFMove(connection), secKeyProxyStore = WTFMove(secKeyProxyStore)](AuthenticationChallengeDisposition disposition, const WebCore::Credential& credential) {
+    , m_listener(AuthenticationDecisionListener::create([challengeID, connection = WTFMove(connection), secKeyProxyStore = WTFMove(secKeyProxyStore)](AuthenticationChallengeDisposition disposition, const WebCore::Credential& credential) {
 #if HAVE(SEC_KEY_PROXY)
         if (secKeyProxyStore && secKeyProxyStore->initialize(credential)) {
@@ -54 +54 @@
 #endif
         connection->send(Messages::AuthenticationManager::CompleteAuthenticationChallenge(challengeID, disposition, credential), 0);
-    }) : nullptr))
+    }))
 {
+    ASSERT(challengeID);
 }
 

trunk/Source/WebKit/UIProcess/Cocoa/ResourceLoadDelegate.h

@@ -62 +62 @@
         void didSendRequest(ResourceLoadInfo&&, WebCore::ResourceRequest&&) const final;
         void didPerformHTTPRedirection(ResourceLoadInfo&&, WebCore::ResourceResponse&&, WebCore::ResourceRequest&&) const final;
-        void didReceiveChallenge(ResourceLoadInfo&&, WebKit::AuthenticationChallengeProxy&) const final;
+        void didReceiveChallenge(ResourceLoadInfo&&, WebCore::AuthenticationChallenge&&) const final;
         void didReceiveResponse(ResourceLoadInfo&&, WebCore::ResourceResponse&&) const final;
         void didCompleteWithError(ResourceLoadInfo&&, WebCore::ResourceResponse&&, WebCore::ResourceError&&) const final;

trunk/Source/WebKit/UIProcess/Cocoa/ResourceLoadDelegate.mm

@@ -27 +27 @@
 #import "ResourceLoadDelegate.h"
 
+#import <WebCore/AuthenticationMac.h>
 #import "AuthenticationChallengeProxy.h"
 #import "WKNSURLAuthenticationChallenge.h"
@@ -98 +99 @@
 }
 
-void ResourceLoadDelegate::ResourceLoadClient::didReceiveChallenge(WebKit::ResourceLoadInfo&& loadInfo, WebKit::AuthenticationChallengeProxy& challenge) const
+void ResourceLoadDelegate::ResourceLoadClient::didReceiveChallenge(WebKit::ResourceLoadInfo&& loadInfo, WebCore::AuthenticationChallenge&& challenge) const
 {
     if (!m_resourceLoadDelegate.m_delegateMethods.didReceiveChallenge)
@@ -107 +108 @@
         return;
 
-    [delegate webView:m_resourceLoadDelegate.m_webView.get().get() resourceLoad:wrapper(API::ResourceLoadInfo::create(WTFMove(loadInfo)).get()) didReceiveChallenge:wrapper(challenge)];
+    [delegate webView:m_resourceLoadDelegate.m_webView.get().get() resourceLoad:wrapper(API::ResourceLoadInfo::create(WTFMove(loadInfo)).get()) didReceiveChallenge:mac(challenge)];
 }
 

trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp

@@ -505 +505 @@
         return;
 
-    auto challengeProxy = AuthenticationChallengeProxy::create(WTFMove(challenge), 0, *connection(), nullptr);
-    page->resourceLoadDidReceiveChallenge(WTFMove(loadInfo), challengeProxy.get());
+    page->resourceLoadDidReceiveChallenge(WTFMove(loadInfo), WTFMove(challenge));
 }
 

trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -6106 +6106 @@
 }
 
-void WebPageProxy::resourceLoadDidReceiveChallenge(ResourceLoadInfo&& loadInfo, WebKit::AuthenticationChallengeProxy& challenge)
+void WebPageProxy::resourceLoadDidReceiveChallenge(ResourceLoadInfo&& loadInfo, WebCore::AuthenticationChallenge&& challenge)
 {
     if (m_resourceLoadClient)
-        m_resourceLoadClient->didReceiveChallenge(WTFMove(loadInfo), challenge);
+        m_resourceLoadClient->didReceiveChallenge(WTFMove(loadInfo), WTFMove(challenge));
 }
 

trunk/Source/WebKit/UIProcess/WebPageProxy.h

@@ -477 +477 @@
     void resourceLoadDidSendRequest(ResourceLoadInfo&&, WebCore::ResourceRequest&&);
     void resourceLoadDidPerformHTTPRedirection(ResourceLoadInfo&&, WebCore::ResourceResponse&&, WebCore::ResourceRequest&&);
-    void resourceLoadDidReceiveChallenge(ResourceLoadInfo&&, WebKit::AuthenticationChallengeProxy&);
+    void resourceLoadDidReceiveChallenge(ResourceLoadInfo&&, WebCore::AuthenticationChallenge&&);
     void resourceLoadDidReceiveResponse(ResourceLoadInfo&&, WebCore::ResourceResponse&&);
     void resourceLoadDidCompleteWithError(ResourceLoadInfo&&, WebCore::ResourceResponse&&, WebCore::ResourceError&&);