Changeset 163999 in webkit

Timestamp:

Feb 12, 2014 4:39:21 PM (10 years ago)

Author:

ap@apple.com

Message:

[WK2] Add a C API to get WebCrypto master key from a client
​https://bugs.webkit.org/show_bug.cgi?id=128702

Reviewed by Anders Carlsson.

Source/WebKit2:

Added a new version of WKContextClient, with a function that returns the key.

• UIProcess/API/C/WKContext.h:
• UIProcess/WebContextClient.cpp:

(WebKit::WebContextClient::copyWebCryptoMasterKey):

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

(WebKit::WebPageProxy::wrapCryptoKey):
(WebKit::WebPageProxy::unwrapCryptoKey):

• UIProcess/mac/WebPageProxyMac.mm:

Tools:

• WebKitTestRunner/TestController.cpp:

(WTR::copyWebCryptoMasterKey):
(WTR::TestController::initialize):
Return a hardcoded key.

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/UIProcess/API/C/WKContext.h (modified) (2 diffs)
• Source/WebKit2/UIProcess/WebContextClient.cpp (modified) (1 diff)
• Source/WebKit2/UIProcess/WebContextClient.h (modified) (4 diffs)
• Source/WebKit2/UIProcess/WebPageProxy.cpp (modified) (2 diffs)
• Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/WebKitTestRunner/TestController.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-02-12  Alexey Proskuryakov  <ap@apple.com>
+
+        [WK2] Add a C API to get WebCrypto master key from a client
+        https://bugs.webkit.org/show_bug.cgi?id=128702
+
+        Reviewed by Anders Carlsson.
+
+        Added a new version of WKContextClient, with a function that returns the key.
+
+        * UIProcess/API/C/WKContext.h:
+        * UIProcess/WebContextClient.cpp:
+        (WebKit::WebContextClient::copyWebCryptoMasterKey):
+        * UIProcess/WebContextClient.h:
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::wrapCryptoKey):
+        (WebKit::WebPageProxy::unwrapCryptoKey):
+        * UIProcess/mac/WebPageProxyMac.mm:
+
 2014-02-12  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/C/WKContext.h

@@ -48 +48 @@
 typedef void (*WKContextNetworkProcessDidCrashCallback)(WKContextRef context, const void *clientInfo);
 typedef void (*WKContextPlugInInformationBecameAvailableCallback)(WKContextRef context, WKArrayRef plugIn, const void *clientInfo);
+typedef WKDataRef (*WKContextCopyWebCryptoMasterKeyCallback)(WKContextRef context, const void *clientInfo);
 
 typedef struct WKContextClientBase {
@@ -63 +64 @@
 } WKContextClientV0;
 
-enum { kWKContextClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
+typedef struct WKContextClientV1 {
+    WKContextClientBase                                                 base;
+
+    // Version 0.
+    WKContextPlugInAutoStartOriginHashesChangedCallback                 plugInAutoStartOriginHashesChanged;
+    WKContextNetworkProcessDidCrashCallback                             networkProcessDidCrash;
+    WKContextPlugInInformationBecameAvailableCallback                   plugInInformationBecameAvailable;
+
+    // Version 1.
+    WKContextCopyWebCryptoMasterKeyCallback                             copyWebCryptoMasterKey;
+} WKContextClientV1;
+
+enum { kWKContextClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 1 };
 typedef struct WKContextClient {
     int                                                                 version;

trunk/Source/WebKit2/UIProcess/WebContextClient.cpp

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

trunk/Source/WebKit2/UIProcess/WebContextClient.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2012, 2014 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28 +28 @@
 
 #include "APIClient.h"
+#include "APIData.h"
 #include "WKContext.h"
 
@@ -34 +35 @@
 
 template<> struct ClientTraits<WKContextClientBase> {
-    typedef std::tuple<WKContextClientV0> Versions;
+    typedef std::tuple<WKContextClientV0, WKContextClientV1> Versions;
 };
 }
@@ -47 +48 @@
     void networkProcessDidCrash(WebContext*);
     void plugInInformationBecameAvailable(WebContext*, API::Array*);
+    PassRefPtr<API::Data> copyWebCryptoMasterKey(WebContext*);
 };
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -4484 +4484 @@
 void WebPageProxy::wrapCryptoKey(const Vector<uint8_t>& key, bool& succeeded, Vector<uint8_t>& wrappedKey)
 {
-    Vector<uint8_t> masterKey(16);
-    memset(masterKey.data(), 0, masterKey.size()); // FIXME: Not implemented yet, will be getting a key from client.
+    RefPtr<API::Data> keyData = m_process->context().client().copyWebCryptoMasterKey(&m_process->context());
+    if (!keyData) {
+        succeeded = false;
+        return;
+    }
+
+    Vector<uint8_t> masterKey = keyData->dataReference().vector();
     succeeded = wrapSerializedCryptoKey(masterKey, key, wrappedKey);
 }
@@ -4491 +4496 @@
 void WebPageProxy::unwrapCryptoKey(const Vector<uint8_t>& wrappedKey, bool& succeeded, Vector<uint8_t>& key)
 {
-    Vector<uint8_t> masterKey(16);
-    memset(masterKey.data(), 0, masterKey.size()); // FIXME: Not implemented yet, will be getting a key from client.
+    RefPtr<API::Data> keyData = m_process->context().client().copyWebCryptoMasterKey(&m_process->context());
+    if (!keyData) {
+        succeeded = false;
+        return;
+    }
+
+    Vector<uint8_t> masterKey = keyData->dataReference().vector();
     succeeded = unwrapSerializedCryptoKey(masterKey, wrappedKey, key);
 }

trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm

@@ -40 +40 @@
 #import "TextChecker.h"
 #import "WKBrowsingContextControllerInternal.h"
+#import "WebContext.h"
 #import "WebPageMessages.h"
 #import "WebProcessProxy.h"

trunk/Tools/ChangeLog

@@ +1 @@
+2014-02-12  Alexey Proskuryakov  <ap@apple.com>
+
+        [WK2] Add a C API to get WebCrypto master key from a client
+        https://bugs.webkit.org/show_bug.cgi?id=128702
+
+        Reviewed by Anders Carlsson.
+
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::copyWebCryptoMasterKey):
+        (WTR::TestController::initialize):
+        Return a hardcoded key.
+
 2014-02-12  David Farler  <dfarler@apple.com>
 

trunk/Tools/WebKitTestRunner/TestController.cpp

@@ -80 +80 @@
     static WKURLRef staticBlankURL = WKURLCreateWithUTF8CString("about:blank");
     return staticBlankURL;
+}
+
+static WKDataRef copyWebCryptoMasterKey(WKContextRef, const void*)
+{
+    // Any 128 bit key would do, all we need for testing is to implement the callback.
+    return WKDataCreate((const uint8_t*)"\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f", 16);
 }
 
@@ -336 +342 @@
 
     platformInitializeContext();
+
+    WKContextClientV1 contextClient = {
+        { 1, this },
+        nullptr, // plugInAutoStartOriginHashesChanged
+        nullptr, // networkProcessDidCrash,
+        nullptr, // plugInInformationBecameAvailable,
+        copyWebCryptoMasterKey
+    };
+    WKContextSetClient(m_context.get(), &contextClient.base);
 
     WKContextInjectedBundleClientV1 injectedBundleClient = {