WebCrypto: Add interfaces for importKey().

Source/modules/crypto/SubtleCrypto.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "modules/crypto/SubtleCrypto.h"
 
+#include "V8Key.h" // NOTE: This must appear before ScriptPromiseResolver to define toV8()
+#include "bindings/v8/ScriptPromiseResolver.h"
 #include "core/dom/ExceptionCode.h"
 #include "modules/crypto/CryptoOperation.h"
+#include "modules/crypto/Key.h"
 #include "modules/crypto/NormalizeAlgorithm.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebArrayBuffer.h" // FIXME: temporary
 #include "public/platform/WebCrypto.h"
+#include "public/platform/WebCryptoAlgorithmParams.h"
 #include "wtf/ArrayBuffer.h"
 #include "wtf/ArrayBufferView.h"
 #include "wtf/SHA1.h" // FIXME: temporary
 
 
 namespace WebCore {
 
 namespace {
 
 // FIXME: The following are temporary implementations of what *should* go on the
@@ skipping 44 matching lines @@
         memcpy(buffer.data(), hash.data(), hash.size());
 
         m_result->completeWithArrayBuffer(buffer);
         delete this;
     }
 
 private:
     SHA1 m_sha1;
 };
 
 class MockPlatformCrypto : public WebKit::WebCrypto {

[abarth-chromium, 2013/07/20 06:32:00]

It would be better if these mock implementations where in the TestRunner
library.  Then we wouldn't have to include them in the production binary...

[eroman, 2013/07/22 17:02:06]

Thanks Adam.

I am trying to wrap my head around how the test-only stuff gets loaded for
content_shell. I did a search for TestRunner but it turned up only a file in
DumpRenderTree/*, which I assumed was no longer relevant.

Will keep digging, but any extra guidance appreciated :)

 public:
     virtual void digest(const WebKit::WebCryptoAlgorithm& algorithm, WebKit::WebCryptoOperationResult* result) OVERRIDE
     {
         if (algorithm.id() == WebKit::WebCryptoAlgorithmIdSha1) {
             result->initializationSucceded(new MockSha1Operation(result));
         } else {
             // Don't fail synchronously, since existing layout tests rely on
             // digest for testing algorithm normalization.
             result->initializationSucceded(new DummyOperation(result));
         }
     }
+
+    virtual void importKey(WebKit::WebCryptoKeyFormat, const unsigned char* keyData, size_t keyDataSize, const WebKit::WebCryptoAlgorithm& algorithm, bool extractable, WebKit::WebCryptoKeyUsageMask usages, WebKit::WebCryptoKeyOperationResult* result)
+    {
+        String keyDataString(keyData, keyDataSize);
+
+        WebKit::WebCryptoKeyType type;
+        if (keyDataString == "reject") {
+            result->completeWithError();
+        } else if (keyDataString == "throw") {
+            result->initializationFailed();
+        } else {
+            if (keyDataString == "public") {
+                type = WebKit::WebCryptoKeyTypePublic;
+            } else if (keyDataString == "private") {
+                type = WebKit::WebCryptoKeyTypePrivate;
+            }
+            result->completeWithKey(WebKit::WebCryptoKey::create(0, type, extractable, algorithm, usages));
+        }
+    }
 };
 
 WebKit::WebCrypto* mockPlatformCrypto()
 {
     DEFINE_STATIC_LOCAL(MockPlatformCrypto, crypto, ());
     return &crypto;
 }
 
 PassRefPtr<CryptoOperation> doDummyOperation(const Dictionary& rawAlgorithm, AlgorithmOperation operationType, ExceptionCode& ec)
 {
     WebKit::WebCryptoAlgorithm algorithm;
     if (!normalizeAlgorithm(rawAlgorithm, operationType, algorithm, ec))
         return 0;
 
     RefPtr<CryptoOperation> op = CryptoOperation::create(algorithm, &ec);
     op->initializationSucceded(new DummyOperation(op.get()));
     return op.release();
 }
 //------------------------------------------------------------------------------
+//
+//
+class KeyOperation : public WebKit::WebCryptoKeyOperationResult {
+public:
+    KeyOperation(ScriptPromiseResolver* resolver, ExceptionCode* ec)
+        : m_state(Initializing)
+        , m_impl(0)
+        , m_promiseResolver(resolver)
+        , m_exceptionCode(ec)
+    {
+    }
+
+    ~KeyOperation();
+
+    // Implementation of WebKit::WebCryptoKeyOperationResult.
+    virtual void initializationFailed() OVERRIDE;
+    virtual void initializationSucceeded(WebKit::WebCryptoKeyOperation*) OVERRIDE;
+    virtual void completeWithError() OVERRIDE;
+    virtual void completeWithKey(const WebKit::WebCryptoKey&) OVERRIDE;
+
+private:
+    enum State {
+        Initializing,
+        InProgress,
+        Done,
+    };
+
+    State m_state;
+    WebKit::WebCryptoKeyOperation* m_impl;
+    ExceptionCode* m_exceptionCode;
+    RefPtr<ScriptPromiseResolver> m_promiseResolver;
+};
+
+KeyOperation::~KeyOperation()
+{
+    // Abort any inprogress operation.
+    switch (m_state) {
+    case Initializing:
+        ASSERT_NOT_REACHED();
+        break;
+    case InProgress:
+        // This will cause m_impl to be deleted.
+        m_state = Done;
+        m_impl->abort();
+        m_impl = 0;
+    case Done:
+        ASSERT(!m_impl);
+        break;
+    }
+}
+
+void KeyOperation::initializationFailed()
+{
+    ASSERT(m_state == Initializing);
+
+    *m_exceptionCode = NotSupportedError;
+
+    m_exceptionCode = 0;
+    m_state = Done;
+    delete this;
+}
+
+void KeyOperation::initializationSucceeded(WebKit::WebCryptoKeyOperation* operationImpl)
+{
+    ASSERT(m_state == Initializing);
+    ASSERT(operationImpl);
+    ASSERT(!m_impl);
+
+    m_exceptionCode = 0;
+    m_impl = operationImpl;
+    m_state = InProgress;
+}
+
+void KeyOperation::completeWithError()
+{
+    ASSERT(m_state == Initializing || m_state == InProgress);
+
+    m_exceptionCode = 0;
+    m_impl = 0;
+    m_state = Done;
+
+    m_promiseResolver->reject(ScriptValue::createNull());
+    delete this;
+}
+
+void KeyOperation::completeWithKey(const WebKit::WebCryptoKey& key)
+{
+    ASSERT(m_state == Initializing || m_state == InProgress);
+
+    m_exceptionCode = 0;
+    m_impl = 0;
+    m_state = Done;
+
+    m_promiseResolver->fulfill(Key::create(key));
+    delete this;
+}
 
 } // namespace
 
 SubtleCrypto::SubtleCrypto()
 {
     ScriptWrappable::init(this);
 }
 
 PassRefPtr<CryptoOperation> SubtleCrypto::encrypt(const Dictionary& rawAlgorithm, ExceptionCode& ec)
 {
@@ skipping 25 matching lines @@
 
     WebKit::WebCryptoAlgorithm algorithm;
     if (!normalizeAlgorithm(rawAlgorithm, Digest, algorithm, ec))
         return 0;
 
     RefPtr<CryptoOperation> op = CryptoOperation::create(algorithm, &ec);
     platformCrypto->digest(algorithm, op.get());
     return op.release();
 }
 
+ScriptObject SubtleCrypto::importKey(const String& rawFormat, ArrayBufferView* keyData, const Dictionary& rawAlgorithm, bool extractable, const Vector<String>& rawKeyUsages, ExceptionCode& ec)
+{
+    WebKit::WebCrypto* platformCrypto = mockPlatformCrypto();
+    if (!platformCrypto) {
+        ec = NotSupportedError;
+        return ScriptObject();
+    }
+
+    WebKit::WebCryptoKeyUsageMask keyUsages;
+    if (!Key::parseUsageMask(rawKeyUsages, keyUsages)) {
+        ec = TypeError;
+        return ScriptObject();
+    }
+
+    WebKit::WebCryptoKeyFormat format;
+    if (!Key::parseFormat(rawFormat, format)) {
+        ec = TypeError;
+        return ScriptObject();
+    }
+
+    WebKit::WebCryptoAlgorithm algorithm;
+    if (!normalizeAlgorithmForImportKey(rawAlgorithm, algorithm, ec))
+        return ScriptObject();
+
+    const unsigned char* keyDataBytes = static_cast<unsigned char*>(keyData->baseAddress());
+
+    RefPtr<ScriptPromiseResolver> promiseResolver = ScriptPromiseResolver::create();
+
+    // The |op| object is deleted upon completion of the underlying operation
+    // (i.e. when platformCrypto->importKey() notifies completion).
+    //
+    // FIXME: KeyOperation is never aborted. It should probably be aborted when
+    // the SubtleCrypto object that started it gets deleted. The concern being
+    // if the operation eventually does complete, the ScriptPromiseResolver
+    // might no longer be valid because the context it belonged to got torn
+    // down.
+    KeyOperation* op = new KeyOperation(promiseResolver.get(), &ec);
+    platformCrypto->importKey(format, keyDataBytes, keyData->byteLength(), algorithm, extractable, keyUsages, op);
+    return promiseResolver->promise();
+}
+
 } // namespace WebCore