Changeset 235418 in webkit

Timestamp:

Aug 27, 2018 5:43:44 PM (6 years ago)

Author:

Basuke Suzuki

Message:

[Curl] Enable Proxy Authentication on WebKit.
​https://bugs.webkit.org/show_bug.cgi?id=188998

Reviewed by Alex Christensen.

Add support for proxy authentication to curl backend running on WebKit.
This is follow up implementation of legacy implementation:

• ​https://bugs.webkit.org/show_bug.cgi?id=185266

• NetworkProcess/curl/NetworkDataTaskCurl.cpp:

(WebKit::NetworkDataTaskCurl::curlDidReceiveResponse):
(WebKit::NetworkDataTaskCurl::tryProxyAuthentication):

• NetworkProcess/curl/NetworkDataTaskCurl.h:
• NetworkProcess/curl/NetworkProcessCurl.cpp:
• PlatformWin.cmake:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/curl/NetworkDataTaskCurl.cpp (modified) (2 diffs)
• NetworkProcess/curl/NetworkDataTaskCurl.h (modified) (1 diff)
• NetworkProcess/curl/NetworkProcessCurl.cpp (modified) (1 diff)
• PlatformWin.cmake (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-08-27  Basuke Suzuki  <Basuke.Suzuki@sony.com>
+
+        [Curl] Enable Proxy Authentication on WebKit.
+        https://bugs.webkit.org/show_bug.cgi?id=188998
+
+        Reviewed by Alex Christensen.
+
+        Add support for proxy authentication to curl backend running on WebKit.
+        This is follow up implementation of legacy implementation:
+        - https://bugs.webkit.org/show_bug.cgi?id=185266
+
+        * NetworkProcess/curl/NetworkDataTaskCurl.cpp:
+        (WebKit::NetworkDataTaskCurl::curlDidReceiveResponse):
+        (WebKit::NetworkDataTaskCurl::tryProxyAuthentication):
+        * NetworkProcess/curl/NetworkDataTaskCurl.h:
+        * NetworkProcess/curl/NetworkProcessCurl.cpp:
+        * PlatformWin.cmake:
+
 2018-08-27  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp

@@ -170 +170 @@
     }
 
+    if (m_response.isProxyAuthenticationRequired()) {
+        tryProxyAuthentication(AuthenticationChallenge(receivedResponse, 0, m_response));
+        return;
+    }
+
     didReceiveResponse(ResourceResponse(m_response), [this, protectedThis = makeRef(*this)](PolicyAction policyAction) {
         if (m_state == State::Canceling || m_state == State::Completed)
@@ -361 +366 @@
 }
 
+void NetworkDataTaskCurl::tryProxyAuthentication(WebCore::AuthenticationChallenge&& challenge)
+{
+    m_client->didReceiveChallenge(AuthenticationChallenge(challenge), [this, protectedThis = makeRef(*this), challenge](AuthenticationChallengeDisposition disposition, const Credential& credential) {
+        if (m_state == State::Canceling || m_state == State::Completed)
+            return;
+
+        if (disposition == AuthenticationChallengeDisposition::Cancel) {
+            cancel();
+            m_client->didCompleteWithError(ResourceError::httpError(CURLE_COULDNT_RESOLVE_PROXY, m_response.url()));
+            return;
+        }
+
+        CurlContext::singleton().setProxyUserPass(credential.user(), credential.password());
+        CurlContext::singleton().setDefaultProxyAuthMethod();
+
+        auto requestCredential = m_curlRequest ? Credential(m_curlRequest->user(), m_curlRequest->password(), CredentialPersistenceNone) : Credential();
+        restartWithCredential(requestCredential);
+    });
+}
+
 void NetworkDataTaskCurl::restartWithCredential(const Credential& credential)
 {

trunk/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.h

@@ -74 +74 @@
 
     void tryHttpAuthentication(WebCore::AuthenticationChallenge&&);
+    void tryProxyAuthentication(WebCore::AuthenticationChallenge&&);
     void restartWithCredential(const WebCore::Credential&);
 

trunk/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp

@@ -34 +34 @@
 #include <WebCore/FileSystem.h>
 #include <WebCore/NetworkStorageSession.h>
+#include "WebCookieManager.h"
+#include <WebCore/CurlContext.h>
 #include <WebCore/NotImplemented.h>
 #include <WebCore/ResourceHandle.h>

trunk/Source/WebKit/PlatformWin.cmake

@@ -177 +177 @@
 
     list(APPEND WebKit_INCLUDE_DIRECTORIES
+        "${WEBCORE_DIR}/platform/network/curl"
         "${WEBKIT_DIR}/NetworkProcess/curl"
         "${WEBKIT_DIR}/WebProcess/WebCoreSupport/curl"