Attachment 362195 Details for Bug 194734 – Patch

[patch] Patch

bug-194734-20190215175848.patch (text/plain), 3.88 KB, created by youenn fablet on 2019-02-15 17:58:49 PST

(hide)

Description:

Filename:

MIME Type:

Creator: youenn fablet

Created: 2019-02-15 17:58:49 PST

Size: 3.88 KB

patch

obsolete

>Subversion Revision: 241548
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 2899fcf63dd978730d468831ae42f33782916341..456416f238a40ee5b85b021e96843a511c309fda 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,21 @@
>+2019-02-15  Youenn Fablet  <youenn@apple.com>
>+
>+        https://device.login.microsoftonline.com is hanging on STP75
>+        https://bugs.webkit.org/show_bug.cgi?id=194734
>+        <rdar://problem/47573830>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Make sure to only go the XPC route if SecKeyProxyStore has credentials.
>+        Tested manually by going to the above website with and without the patch.
>+        Load hangs without the patch and completes with the patch.
>+
>+        * UIProcess/Authentication/AuthenticationChallengeProxy.cpp:
>+        (WebKit::AuthenticationChallengeProxy::AuthenticationChallengeProxy):
>+        * UIProcess/Authentication/cocoa/SecKeyProxyStore.h:
>+        * UIProcess/Authentication/cocoa/SecKeyProxyStore.mm:
>+        (WebKit::SecKeyProxyStore::initialize):
>+
> 2019-02-15  Youenn Fablet  <youenn@apple.com>
> 
>         Move service worker response validation from the service worker client to the service worker itself
>diff --git a/Source/WebKit/UIProcess/Authentication/AuthenticationChallengeProxy.cpp b/Source/WebKit/UIProcess/Authentication/AuthenticationChallengeProxy.cpp
>index 8f3b55d0ebf19dc0a5f7e7c55eac27980b836f37..d9c41733a2812589269c6d5bd486828af12ec742 100644
>--- a/Source/WebKit/UIProcess/Authentication/AuthenticationChallengeProxy.cpp
>+++ b/Source/WebKit/UIProcess/Authentication/AuthenticationChallengeProxy.cpp
>@@ -47,8 +47,7 @@ AuthenticationChallengeProxy::AuthenticationChallengeProxy(WebCore::Authenticati
>     : m_coreAuthenticationChallenge(WTFMove(authenticationChallenge))
>     , 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);
>+        if (secKeyProxyStore && secKeyProxyStore->initialize(credential)) {
>             sendClientCertificateCredentialOverXpc(connection, *secKeyProxyStore, challengeID, credential);
>             return;
>         }
>diff --git a/Source/WebKit/UIProcess/Authentication/cocoa/SecKeyProxyStore.h b/Source/WebKit/UIProcess/Authentication/cocoa/SecKeyProxyStore.h
>index 29d38a175ffe4ec53558bbb3ecae8e63cfc65135..bec75cf30701ba8ec2de1186dce582cc320347d6 100644
>--- a/Source/WebKit/UIProcess/Authentication/cocoa/SecKeyProxyStore.h
>+++ b/Source/WebKit/UIProcess/Authentication/cocoa/SecKeyProxyStore.h
>@@ -43,7 +43,7 @@ class SecKeyProxyStore : public RefCounted<SecKeyProxyStore> {
> public:
>     static Ref<SecKeyProxyStore> create() { return adoptRef(* new SecKeyProxyStore()); }
> 
>-    void initialize(const WebCore::Credential&);
>+    bool initialize(const WebCore::Credential&);
>     bool isInitialized() const { return !!m_secKeyProxy; }
> 
>     auto* get() const { return m_secKeyProxy.get(); }
>diff --git a/Source/WebKit/UIProcess/Authentication/cocoa/SecKeyProxyStore.mm b/Source/WebKit/UIProcess/Authentication/cocoa/SecKeyProxyStore.mm
>index 090d5212adb1cda802fe1ec2e6413233629621fd..1c75bd425eeb28269369be048b584e39d53a2f93 100644
>--- a/Source/WebKit/UIProcess/Authentication/cocoa/SecKeyProxyStore.mm
>+++ b/Source/WebKit/UIProcess/Authentication/cocoa/SecKeyProxyStore.mm
>@@ -33,10 +33,11 @@
> 
> namespace WebKit {
> 
>-void SecKeyProxyStore::initialize(const WebCore::Credential& credential)
>+bool SecKeyProxyStore::initialize(const WebCore::Credential& credential)
> {
>     if (!credential.isEmpty() && credential.nsCredential().identity)
>         m_secKeyProxy = adoptNS([[SecKeyProxy alloc] initWithIdentity:credential.nsCredential().identity]);
>+    return isInitialized();
> }
> 
> } // namespace WebKit

Actions: View | Formatted Diff | Diff

Attachments on bug 194734: 362195