Changeset 207993 in webkit

Timestamp:

Oct 27, 2016, 11:16:22 AM (10 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r206684. rdar://problem/28545011

Location:

branches/safari-602-branch/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/APILoaderClient.h (modified) (1 diff)
• UIProcess/API/C/WKContext.h (modified) (2 diffs)
• UIProcess/API/C/WKPage.cpp (modified) (3 diffs)
• UIProcess/Cocoa/NavigationState.mm (modified) (2 diffs)
• UIProcess/WebContextClient.cpp (modified) (1 diff)
• UIProcess/WebContextClient.h (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (2 diffs)

branches/safari-602-branch/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-10-27  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r206684. rdar://problem/28545011
+
+    2016-09-30  Brady Eidson  <beidson@apple.com>
+
+            REGRESSION (Safari 10 combined with WK changes): Unable to store WebCrypto keys in IndexedDB database.
+            <rdar://problem/28334440> and https://bugs.webkit.org/show_bug.cgi?id=162554
+
+            Reviewed by Alexey Proskuryakov.
+
+            Safari 10 has a WKPageNavigation client but does not implement the "copyWebCryptoMasterKey" callback.
+
+            WebKit just fails in this case, instead of falling back to "getDefaultWebCryptoMasterKey".
+            It should fall back.
+
+            Additionally there's a WKContextClient callback to get the crypto key, also, but it is completely unused.
+            So it should be pulled.
+
+            * UIProcess/API/APILoaderClient.h:
+            (API::LoaderClient::webCryptoMasterKey): Deleted.
+            * UIProcess/API/C/WKContext.h:
+
+            * UIProcess/API/C/WKPage.cpp:
+            (WKPageSetPageLoaderClient):
+            (WKPageSetPageNavigationClient): If the client doesn't implement this method, fallback to getDefaultWebCryptoMasterKey.
+
+            * UIProcess/Cocoa/NavigationState.mm:
+            (WebKit::NavigationState::NavigationClient::webCryptoMasterKey): If the client doesn't implement this method,
+              fallback to getDefaultWebCryptoMasterKey.
+
+            * UIProcess/WebContextClient.cpp:
+            (WebKit::WebContextClient::copyWebCryptoMasterKey): Deleted.
+            * UIProcess/WebContextClient.h:
+
+            * UIProcess/WebPageProxy.cpp:
+            (WebKit::WebPageProxy::wrapCryptoKey): Only ask the NavigationClient before falling back. Don't ask the loader client.
+            (WebKit::WebPageProxy::unwrapCryptoKey): Ditto.
+
 2016-10-26  David Kilzer  <ddkilzer@apple.com>
 

branches/safari-602-branch/Source/WebKit2/UIProcess/API/APILoaderClient.h

@@ -94 +94 @@
     virtual void willGoToBackForwardListItem(WebKit::WebPageProxy&, WebKit::WebBackForwardListItem*, API::Object*) { }
 
-    virtual RefPtr<Data> webCryptoMasterKey(WebKit::WebPageProxy&) { return nullptr; }
-
     virtual void didNavigateWithNavigationData(WebKit::WebPageProxy&, const WebKit::WebNavigationDataStore&, WebKit::WebFrameProxy&) { }
     virtual void didPerformClientRedirect(WebKit::WebPageProxy&, const WTF::String&, const WTF::String&, WebKit::WebFrameProxy&) { }

branches/safari-602-branch/Source/WebKit2/UIProcess/API/C/WKContext.h

@@ -76 +76 @@
 
     // Version 1.
-    WKContextCopyWebCryptoMasterKeyCallback                             copyWebCryptoMasterKey;
+    void                                                                (*copyWebCryptoMasterKey_unavailable)(void);
 } WKContextClientV1;
 
@@ -88 +88 @@
 
     // Version 1.
-    WKContextCopyWebCryptoMasterKeyCallback                             copyWebCryptoMasterKey;
+    void                                                                (*copyWebCryptoMasterKey_unavailable)(void);
 
     // Version 2.

branches/safari-602-branch/Source/WebKit2/UIProcess/API/C/WKPage.cpp

@@ -72 +72 @@
 #include <WebCore/Page.h>
 #include <WebCore/SecurityOriginData.h>
+#include <WebCore/SerializedCryptoKeyWrap.h>
 #include <WebCore/WindowFeatures.h>
 
@@ -1213 +1214 @@
             if (m_client.willGoToBackForwardListItem)
                 m_client.willGoToBackForwardListItem(toAPI(&page), toAPI(item), toAPI(userData), m_client.base.clientInfo);
-        }
-
-        RefPtr<API::Data> webCryptoMasterKey(WebPageProxy& page) override
-        {
-            return page.process().processPool().client().copyWebCryptoMasterKey(&page.process().processPool());
         }
 
@@ -2327 +2323 @@
         RefPtr<API::Data> webCryptoMasterKey(WebPageProxy& page) override
         {
-            if (!m_client.copyWebCryptoMasterKey)
+            if (m_client.copyWebCryptoMasterKey)
+                return adoptRef(toImpl(m_client.copyWebCryptoMasterKey(toAPI(&page), m_client.base.clientInfo)));
+
+            Vector<uint8_t> masterKey;
+            if (!getDefaultWebCryptoMasterKey(masterKey))
                 return nullptr;
-            return adoptRef(toImpl(m_client.copyWebCryptoMasterKey(toAPI(&page), m_client.base.clientInfo)));
+
+            return API::Data::create(masterKey.data(), masterKey.size());
         }
 

branches/safari-602-branch/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm

@@ -64 +64 @@
 #import <WebCore/Credential.h>
 #import <WebCore/SecurityOriginData.h>
+#import <WebCore/SerializedCryptoKeyWrap.h>
 #import <WebCore/URL.h>
 #import <wtf/NeverDestroyed.h>
@@ -716 +717 @@
 RefPtr<API::Data> NavigationState::NavigationClient::webCryptoMasterKey(WebKit::WebPageProxy&)
 {
-    if (!m_navigationState.m_navigationDelegateMethods.webCryptoMasterKeyForWebView)
-        return nullptr;
+    if (!m_navigationState.m_navigationDelegateMethods.webCryptoMasterKeyForWebView) {
+        Vector<uint8_t> masterKey;
+        if (!getDefaultWebCryptoMasterKey(masterKey))
+            return nullptr;
+
+        return API::Data::create(masterKey.data(), masterKey.size());
+    }
 
     auto navigationDelegate = m_navigationState.m_navigationDelegate.get();

branches/safari-602-branch/Source/WebKit2/UIProcess/WebContextClient.cpp

@@ -66 +66 @@
     m_client.plugInInformationBecameAvailable(toAPI(processPool), toAPI(plugInInfo), m_client.base.clientInfo);
 }
-
-PassRefPtr<API::Data> WebContextClient::copyWebCryptoMasterKey(WebProcessPool* processPool)
-{
-    if (!m_client.copyWebCryptoMasterKey)
-        return nullptr;
-
-    return adoptRef(toImpl(m_client.copyWebCryptoMasterKey(toAPI(processPool), m_client.base.clientInfo)));
-}
-
+    
 } // namespace WebKit

branches/safari-602-branch/Source/WebKit2/UIProcess/WebContextClient.h

@@ -50 +50 @@
     void databaseProcessDidCrash(WebProcessPool*);
     void plugInInformationBecameAvailable(WebProcessPool*, API::Array*);
-    PassRefPtr<API::Data> copyWebCryptoMasterKey(WebProcessPool*);
 };
 

branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -6065 +6065 @@
         if (RefPtr<API::Data> keyData = m_navigationClient->webCryptoMasterKey(*this))
             masterKey = keyData->dataReference().vector();
-    } else if (RefPtr<API::Data> keyData = m_loaderClient->webCryptoMasterKey(*this))
-        masterKey = keyData->dataReference().vector();
-    else if (!getDefaultWebCryptoMasterKey(masterKey)) {
+    } else if (!getDefaultWebCryptoMasterKey(masterKey)) {
         succeeded = false;
         return;
@@ -6084 +6082 @@
         if (RefPtr<API::Data> keyData = m_navigationClient->webCryptoMasterKey(*this))
             masterKey = keyData->dataReference().vector();
-    } else if (RefPtr<API::Data> keyData = m_loaderClient->webCryptoMasterKey(*this))
-        masterKey = keyData->dataReference().vector();
-    else if (!getDefaultWebCryptoMasterKey(masterKey)) {
+    } else if (!getDefaultWebCryptoMasterKey(masterKey)) {
         succeeded = false;
         return;