Attachment 347132 Details for Bug 188592 – Patch

[patch] Patch

bug-188592-20180814170030.patch (text/plain), 4.42 KB, created by youenn fablet on 2018-08-14 17:00:31 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: youenn fablet

Created: 2018-08-14 17:00:31 PDT

Size: 4.42 KB

patch

obsolete

>Subversion Revision: 234848
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 91b71f7bfc9b73f757f8b74ae88fbfcb4b4f3d2a..85d607cfd648640670921967ef7aad5e858a2121 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,23 @@
>+2018-08-14  Youenn Fablet  <youenn@apple.com>
>+
>+        NetworkCORSPreflightChecker should proceed in case of ProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested even though the WebKit app is not implementing the didReceiveAuthenticationChallenge/didReceiveAuthenticationChallengeInFrame callback
>+        https://bugs.webkit.org/show_bug.cgi?id=188592
>+        <rdar://problem/43210331>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        If the didReceiveAuthenticationChallenge callback is not called, the load is cancelled.
>+        This was previously cancelling the load but not completing the preflight.
>+
>+        Instead, for any ProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested, we proceed.
>+        Otherwise, when the load is cancelled, we complete the preflight as blocked.
>+
>+        Validated by manual testing.
>+
>+        * NetworkProcess/NetworkCORSPreflightChecker.cpp:
>+        (WebKit::NetworkCORSPreflightChecker::didReceiveChallenge):
>+        * NetworkProcess/NetworkCORSPreflightChecker.h:
>+
> 2018-08-13  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         [WK2] [macOS] Implement a mechanism to test drag and drop
>diff --git a/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.cpp b/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.cpp
>index fb6861fb4a4503612dba3848cb73e4cddcb30a2a..2d08883fe3c0c08e38ddfb6dcc0c534d029c0ebf 100644
>--- a/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.cpp
>@@ -94,15 +94,22 @@ void NetworkCORSPreflightChecker::didReceiveChallenge(const WebCore::Authenticat
>     RELEASE_LOG_IF_ALLOWED("didReceiveChallenge, authentication scheme: %u", challenge.protectionSpace().authenticationScheme());
> 
>     auto scheme = challenge.protectionSpace().authenticationScheme();
>-    bool isTLSHandshake = scheme == ProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested
>-        || scheme == ProtectionSpaceAuthenticationSchemeClientCertificateRequested;
>+    if (scheme == ProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested) {
>+        completionHandler(AuthenticationChallengeDisposition::RejectProtectionSpace, { });
>+        return;
>+    }
> 
>-    if (!isTLSHandshake) {
>+    if (scheme != ProtectionSpaceAuthenticationSchemeClientCertificateRequested) {
>         completionHandler(AuthenticationChallengeDisposition::UseCredential, { });
>         return;
>     }
> 
>-    NetworkProcess::singleton().authenticationManager().didReceiveAuthenticationChallenge(m_parameters.pageID, m_parameters.frameID, challenge, WTFMove(completionHandler));
>+    // FIXME: We should implement PROTECTION_SPACE_AUTH_CALLBACK code path.
>+    NetworkProcess::singleton().authenticationManager().didReceiveAuthenticationChallenge(m_parameters.pageID, m_parameters.frameID, challenge, [completionHandler = WTFMove(completionHandler), weakThis = makeWeakPtr(this)](AuthenticationChallengeDisposition disposition, const WebCore::Credential& credential) mutable {
>+        if (disposition == AuthenticationChallengeDisposition::Cancel && weakThis)
>+            weakThis->wasBlocked();
>+        completionHandler(disposition, credential);
>+    });
> }
> 
> void NetworkCORSPreflightChecker::didReceiveResponseNetworkSession(WebCore::ResourceResponse&& response, ResponseCompletionHandler&& completionHandler)
>diff --git a/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.h b/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.h
>index 5d6e6363d68bdf76c4e22adf95ee988bd971ba28..730425f9516d121c9d8b837e42edca48295e3189 100644
>--- a/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.h
>+++ b/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.h
>@@ -30,6 +30,7 @@
> #include <WebCore/StoredCredentialsPolicy.h>
> #include <pal/SessionID.h>
> #include <wtf/CompletionHandler.h>
>+#include <wtf/WeakPtr.h>
> 
> namespace WebCore {
> class ResourceError;
>@@ -38,7 +39,7 @@ class SecurityOrigin;
> 
> namespace WebKit {
> 
>-class NetworkCORSPreflightChecker final : private NetworkDataTaskClient  {
>+class NetworkCORSPreflightChecker final : private NetworkDataTaskClient, public CanMakeWeakPtr<NetworkCORSPreflightChecker> {
>     WTF_MAKE_FAST_ALLOCATED;
> public:
>     struct Parameters {

Actions: View | Formatted Diff | Diff

Attachments on bug 188592: 347132 | 347182 | 347183 | 347191