[webcrypto] Make all of the crypto.subtle method failures asynchronous.

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 15 matching lines @@
  * 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 "bindings/v8/Dictionary.h"
 #include "bindings/v8/ExceptionState.h"
-#include "core/dom/ExceptionCode.h"
 #include "modules/crypto/CryptoResultImpl.h"
 #include "modules/crypto/Key.h"
 #include "modules/crypto/NormalizeAlgorithm.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebCrypto.h"
 #include "public/platform/WebCryptoAlgorithm.h"
 #include "wtf/ArrayBufferView.h"
 
 namespace WebCore {
 
 DEFINE_GC_INFO(SubtleCrypto);
 
 namespace {
 
 bool parseAlgorithm(const Dictionary& rawAlgorithm, AlgorithmOperation operationType, blink::WebCryptoAlgorithm &algorithm, ExceptionState& exceptionState, CryptoResult* result)
 {
-    String errorDetails;
-    if (parseAlgorithm(rawAlgorithm, operationType, algorithm, errorDetails, exceptionState))
-        return true;
-
-    if (!exceptionState.hadException())
-        result->completeWithError(errorDetails);
-
-    return false;
+    if (!rawAlgorithm.isObject()) {
+        exceptionState.throwTypeError("Algorithm: Not an object");
+        return false;
+    }
+    return parseAlgorithm(rawAlgorithm, operationType, algorithm, result);
 }
 
 ScriptPromise startCryptoOperation(const Dictionary& rawAlgorithm, Key* key, AlgorithmOperation operationType, ArrayBufferView* signature, ArrayBufferView* dataBuffer, ExceptionState& exceptionState)
 {
     bool requiresKey = operationType != Digest;
 
     // Seems like the generated bindings should take care of these however it
     // currently doesn't. See also http://crbugh.com/264520
     if (requiresKey && !key) {
         exceptionState.throwTypeError("Invalid key argument");
         return ScriptPromise();
     }
     if (operationType == Verify && !signature) {
         exceptionState.throwTypeError("Invalid signature argument");
         return ScriptPromise();
     }
     if (!dataBuffer) {
         exceptionState.throwTypeError("Invalid dataBuffer argument");
         return ScriptPromise();
     }
 
     ScriptPromise promise = ScriptPromise::createPending();
     RefPtr<CryptoResultImpl> result = CryptoResultImpl::create(promise);
 
     blink::WebCryptoAlgorithm algorithm;
     if (!parseAlgorithm(rawAlgorithm, operationType, algorithm, exceptionState, result.get()))
         return promise;
 
-    String errorDetails;
-    if (requiresKey && !key->canBeUsedForAlgorithm(algorithm, operationType, errorDetails)) {
-        result->completeWithError(errorDetails);
+    if (requiresKey && !key->canBeUsedForAlgorithm(algorithm, operationType, result.get()))
         return promise;
-    }
 
     const unsigned char* data = static_cast<const unsigned char*>(dataBuffer->baseAddress());
     unsigned dataSize = dataBuffer->byteLength();
 
     switch (operationType) {
     case Encrypt:
         blink::Platform::current()->crypto()->encrypt(algorithm, key->key(), data, dataSize, result->result());
         break;
     case Decrypt:
         blink::Platform::current()->crypto()->decrypt(algorithm, key->key(), data, dataSize, result->result());
@@ skipping 42 matching lines @@
     return startCryptoOperation(rawAlgorithm, key, Verify, signature, data, exceptionState);
 }
 
 ScriptPromise SubtleCrypto::digest(const Dictionary& rawAlgorithm, ArrayBufferView* data, ExceptionState& exceptionState)
 {
     return startCryptoOperation(rawAlgorithm, 0, Digest, 0, data, exceptionState);
 }
 
 ScriptPromise SubtleCrypto::generateKey(const Dictionary& rawAlgorithm, bool extractable, const Vector<String>& rawKeyUsages, ExceptionState& exceptionState)
 {
-    blink::WebCryptoKeyUsageMask keyUsages;
-    if (!Key::parseUsageMask(rawKeyUsages, keyUsages, exceptionState))
-        return ScriptPromise();
-
     ScriptPromise promise = ScriptPromise::createPending();
     RefPtr<CryptoResultImpl> result = CryptoResultImpl::create(promise);
 
+    blink::WebCryptoKeyUsageMask keyUsages;
+    if (!Key::parseUsageMask(rawKeyUsages, keyUsages, result.get()))
+        return promise;
+
     blink::WebCryptoAlgorithm algorithm;
     if (!parseAlgorithm(rawAlgorithm, GenerateKey, algorithm, exceptionState, result.get()))
         return promise;
 
     blink::Platform::current()->crypto()->generateKey(algorithm, extractable, keyUsages, result->result());
     return promise;
 }
 
 ScriptPromise SubtleCrypto::importKey(const String& rawFormat, ArrayBufferView* keyData, const Dictionary& rawAlgorithm, bool extractable, const Vector<String>& rawKeyUsages, ExceptionState& exceptionState)
 {
-    blink::WebCryptoKeyFormat format;
-    if (!Key::parseFormat(rawFormat, format, exceptionState))
-        return ScriptPromise();
-
     if (!keyData) {
         exceptionState.throwTypeError("Invalid keyData argument");
         return ScriptPromise();
     }
 
-    blink::WebCryptoKeyUsageMask keyUsages;
-    if (!Key::parseUsageMask(rawKeyUsages, keyUsages, exceptionState))
-        return ScriptPromise();
-
     ScriptPromise promise = ScriptPromise::createPending();
     RefPtr<CryptoResultImpl> result = CryptoResultImpl::create(promise);
 
+    blink::WebCryptoKeyFormat format;
+    if (!Key::parseFormat(rawFormat, format, result.get()))
+        return promise;
+
+    blink::WebCryptoKeyUsageMask keyUsages;
+    if (!Key::parseUsageMask(rawKeyUsages, keyUsages, result.get()))
+        return promise;
+
     // The algorithm is optional.
     blink::WebCryptoAlgorithm algorithm;
     if (!rawAlgorithm.isUndefinedOrNull() && !parseAlgorithm(rawAlgorithm, ImportKey, algorithm, exceptionState, result.get()))
         return promise;
 
     const unsigned char* keyDataBytes = static_cast<unsigned char*>(keyData->baseAddress());
 
     blink::Platform::current()->crypto()->importKey(format, keyDataBytes, keyData->byteLength(), algorithm, extractable, keyUsages, result->result());
     return promise;
 }
 
 ScriptPromise SubtleCrypto::exportKey(const String& rawFormat, Key* key, ExceptionState& exceptionState)
 {
-    blink::WebCryptoKeyFormat format;
-    if (!Key::parseFormat(rawFormat, format, exceptionState))
-        return ScriptPromise();
-
     if (!key) {
         exceptionState.throwTypeError("Invalid key argument");
         return ScriptPromise();
     }
 
     ScriptPromise promise = ScriptPromise::createPending();
     RefPtr<CryptoResultImpl> result = CryptoResultImpl::create(promise);
 
+    blink::WebCryptoKeyFormat format;
+    if (!Key::parseFormat(rawFormat, format, result.get()))
+        return promise;
+
     if (!key->extractable()) {
         result->completeWithError("key is not extractable");
         return promise;
     }
 
     blink::Platform::current()->crypto()->exportKey(format, key->key(), result->result());
     return promise;
 }
 
 ScriptPromise SubtleCrypto::wrapKey(const String& rawFormat, Key* key, Key* wrappingKey, const Dictionary& rawWrapAlgorithm, ExceptionState& exceptionState)
 {
-    blink::WebCryptoKeyFormat format;
-    if (!Key::parseFormat(rawFormat, format, exceptionState))
-        return ScriptPromise();
-
     if (!key) {
         exceptionState.throwTypeError("Invalid key argument");
         return ScriptPromise();
     }
 
     if (!wrappingKey) {
         exceptionState.throwTypeError("Invalid wrappingKey argument");
         return ScriptPromise();
     }
 
     ScriptPromise promise = ScriptPromise::createPending();
     RefPtr<CryptoResultImpl> result = CryptoResultImpl::create(promise);
 
+    blink::WebCryptoKeyFormat format;
+    if (!Key::parseFormat(rawFormat, format, result.get()))
+        return promise;
+
     blink::WebCryptoAlgorithm wrapAlgorithm;
     if (!parseAlgorithm(rawWrapAlgorithm, WrapKey, wrapAlgorithm, exceptionState, result.get()))
         return promise;
 
     if (!key->extractable()) {
         result->completeWithError("key is not extractable");
         return promise;
     }
 
-    String errorDetails;
-    if (!wrappingKey->canBeUsedForAlgorithm(wrapAlgorithm, WrapKey, errorDetails)) {
-        result->completeWithError(errorDetails);
+    if (!wrappingKey->canBeUsedForAlgorithm(wrapAlgorithm, WrapKey, result.get()))
         return promise;
-    }
 
     blink::Platform::current()->crypto()->wrapKey(format, key->key(), wrappingKey->key(), wrapAlgorithm, result->result());
     return promise;
 }
 
 ScriptPromise SubtleCrypto::unwrapKey(const String& rawFormat, ArrayBufferView* wrappedKey, Key* unwrappingKey, const Dictionary& rawUnwrapAlgorithm, const Dictionary& rawUnwrappedKeyAlgorithm, bool extractable, const Vector<String>& rawKeyUsages, ExceptionState& exceptionState)
 {
-    blink::WebCryptoKeyFormat format;
-    if (!Key::parseFormat(rawFormat, format, exceptionState))
-        return ScriptPromise();
-
     if (!wrappedKey) {
         exceptionState.throwTypeError("Invalid wrappedKey argument");
         return ScriptPromise();
     }
 
     if (!unwrappingKey) {
         exceptionState.throwTypeError("Invalid unwrappingKey argument");
         return ScriptPromise();
     }
 
-    blink::WebCryptoKeyUsageMask keyUsages;
-    if (!Key::parseUsageMask(rawKeyUsages, keyUsages, exceptionState))
-        return ScriptPromise();
-
     ScriptPromise promise = ScriptPromise::createPending();
     RefPtr<CryptoResultImpl> result = CryptoResultImpl::create(promise);
 
+    blink::WebCryptoKeyFormat format;
+    if (!Key::parseFormat(rawFormat, format, result.get()))
+        return promise;
+
+    blink::WebCryptoKeyUsageMask keyUsages;
+    if (!Key::parseUsageMask(rawKeyUsages, keyUsages, result.get()))
+        return promise;
+
     blink::WebCryptoAlgorithm unwrapAlgorithm;
     if (!parseAlgorithm(rawUnwrapAlgorithm, UnwrapKey, unwrapAlgorithm, exceptionState, result.get()))
         return promise;
 
     // The unwrappedKeyAlgorithm is optional.
     blink::WebCryptoAlgorithm unwrappedKeyAlgorithm;
     if (!rawUnwrappedKeyAlgorithm.isUndefinedOrNull() && !parseAlgorithm(rawUnwrappedKeyAlgorithm, ImportKey, unwrappedKeyAlgorithm, exceptionState, result.get()))
         return promise;
 
-    String errorDetails;
-    if (!unwrappingKey->canBeUsedForAlgorithm(unwrapAlgorithm, UnwrapKey, errorDetails)) {
-        result->completeWithError(errorDetails);
+    if (!unwrappingKey->canBeUsedForAlgorithm(unwrapAlgorithm, UnwrapKey, result.get()))
         return promise;
-    }
 
     const unsigned char* wrappedKeyData = static_cast<const unsigned char*>(wrappedKey->baseAddress());
     unsigned wrappedKeyDataSize = wrappedKey->byteLength();
 
     blink::Platform::current()->crypto()->unwrapKey(format, wrappedKeyData, wrappedKeyDataSize, unwrappingKey->key(), unwrapAlgorithm, unwrappedKeyAlgorithm, extractable, keyUsages, result->result());
     return promise;
 }
 
 } // namespace WebCore