Add [TypeChecking=Unrestricted] to SubtleCrypto interface

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 41 matching lines @@
     if (bufferSource.isArrayBuffer()) {
         data = bufferSource.getAsArrayBuffer()->data();
         len = bufferSource.getAsArrayBuffer()->byteLength();
     } else if (bufferSource.isArrayBufferView()) {
         data = bufferSource.getAsArrayBufferView()->baseAddress();
         len = bufferSource.getAsArrayBufferView()->byteLength();
     }
     initWithData(data, len);
 }
 
-// Seems like the generated bindings should take care of these however it
-// currently doesn't. See also http://crbug.com/264520
-static bool ensureNotNull(const DOMArrayPiece& x, const char* paramName, CryptoResult* result)
-{
-    if (x.isNull()) {
-        String message = String("Invalid ") + paramName + String(" argument");
-        result->completeWithError(WebCryptoErrorTypeType, WebString(message));
-        return false;
-    }
-    return true;
-}
-
-static bool ensureNotNull(const ArrayBufferOrArrayBufferViewOrDictionary& dictionary, const char* paramName, CryptoResult* result)
-{
-    if (dictionary.isNull()) {
-        String message = String("Invalid ") + paramName + String(" argument");
-        result->completeWithError(WebCryptoErrorTypeType, WebString(message));
-        return false;
-    }
-    return true;
-}
-
-static bool ensureNotNull(CryptoKey* key, const char* paramName, CryptoResult* result)
-{
-    if (!key) {
-        String message = String("Invalid ") + paramName + String(" argument");
-        result->completeWithError(WebCryptoErrorTypeType, WebString(message));
-        return false;
-    }
-    return true;
-}
-
 static bool parseAlgorithm(const AlgorithmIdentifier& raw, WebCryptoOperation op, WebCryptoAlgorithm& algorithm, CryptoResult* result)
 {
     AlgorithmError error;
     bool success = normalizeAlgorithm(raw, op, algorithm, &error);
     if (!success)
         result->completeWithError(error.errorType, error.errorDetails);
     return success;
 }
 
 static bool canAccessWebCrypto(ScriptState* scriptState, CryptoResult* result)
@@ skipping 64 matching lines @@
 }
 
 ScriptPromise SubtleCrypto::encrypt(ScriptState* scriptState, const AlgorithmIdentifier& rawAlgorithm, CryptoKey* key, const DOMArrayPiece& data)
 {
     RefPtrWillBeRawPtr<CryptoResultImpl> result = CryptoResultImpl::create(scriptState);
     ScriptPromise promise = result->promise();
 
     if (!canAccessWebCrypto(scriptState, result.get()))
         return promise;
 
-    if (!ensureNotNull(key, "key", result.get()))
-        return promise;
-    if (!ensureNotNull(data, "dataBuffer", result.get()))
-        return promise;
-
     WebCryptoAlgorithm algorithm;
     if (!parseAlgorithm(rawAlgorithm, WebCryptoOperationEncrypt, algorithm, result.get()))
         return promise;
 
     if (!key->canBeUsedForAlgorithm(algorithm, WebCryptoKeyUsageEncrypt, result.get()))
         return promise;
 
     Platform::current()->crypto()->encrypt(algorithm, key->key(), data.bytes(), data.byteLength(), result->result());
     return promise;
 }
 
 ScriptPromise SubtleCrypto::decrypt(ScriptState* scriptState, const AlgorithmIdentifier& rawAlgorithm, CryptoKey* key, const DOMArrayPiece& data)
 {
     RefPtrWillBeRawPtr<CryptoResultImpl> result = CryptoResultImpl::create(scriptState);
     ScriptPromise promise = result->promise();
 
     if (!canAccessWebCrypto(scriptState, result.get()))
         return promise;
 
-    if (!ensureNotNull(key, "key", result.get()))
-        return promise;
-    if (!ensureNotNull(data, "dataBuffer", result.get()))
-        return promise;
-
     WebCryptoAlgorithm algorithm;
     if (!parseAlgorithm(rawAlgorithm, WebCryptoOperationDecrypt, algorithm, result.get()))
         return promise;
 
     if (!key->canBeUsedForAlgorithm(algorithm, WebCryptoKeyUsageDecrypt, result.get()))
         return promise;
 
     Platform::current()->crypto()->decrypt(algorithm, key->key(), data.bytes(), data.byteLength(), result->result());
     return promise;
 }
 
 ScriptPromise SubtleCrypto::sign(ScriptState* scriptState, const AlgorithmIdentifier& rawAlgorithm, CryptoKey* key, const DOMArrayPiece& data)
 {
     RefPtrWillBeRawPtr<CryptoResultImpl> result = CryptoResultImpl::create(scriptState);
     ScriptPromise promise = result->promise();
 
     if (!canAccessWebCrypto(scriptState, result.get()))
         return promise;
 
-    if (!ensureNotNull(key, "key", result.get()))
-        return promise;
-    if (!ensureNotNull(data, "dataBuffer", result.get()))
-        return promise;
-
     WebCryptoAlgorithm algorithm;
     if (!parseAlgorithm(rawAlgorithm, WebCryptoOperationSign, algorithm, result.get()))
         return promise;
 
     if (!key->canBeUsedForAlgorithm(algorithm, WebCryptoKeyUsageSign, result.get()))
         return promise;
 
     Platform::current()->crypto()->sign(algorithm, key->key(), data.bytes(), data.byteLength(), result->result());
     return promise;
 }
 
 ScriptPromise SubtleCrypto::verifySignature(ScriptState* scriptState, const AlgorithmIdentifier& rawAlgorithm, CryptoKey* key, const DOMArrayPiece& signature, const DOMArrayPiece& data)
 {
     RefPtrWillBeRawPtr<CryptoResultImpl> result = CryptoResultImpl::create(scriptState);
     ScriptPromise promise = result->promise();
 
     if (!canAccessWebCrypto(scriptState, result.get()))
         return promise;
 
-    if (!ensureNotNull(key, "key", result.get()))
-        return promise;
-    if (!ensureNotNull(data, "dataBuffer", result.get()))
-        return promise;
-    if (!ensureNotNull(signature, "signature", result.get()))
-        return promise;
-
     WebCryptoAlgorithm algorithm;
     if (!parseAlgorithm(rawAlgorithm, WebCryptoOperationVerify, algorithm, result.get()))
         return promise;
 
     if (!key->canBeUsedForAlgorithm(algorithm, WebCryptoKeyUsageVerify, result.get()))
         return promise;
 
     Platform::current()->crypto()->verifySignature(algorithm, key->key(), signature.bytes(), signature.byteLength(), data.bytes(), data.byteLength(), result->result());
     return promise;
 }
 
 ScriptPromise SubtleCrypto::digest(ScriptState* scriptState, const AlgorithmIdentifier& rawAlgorithm, const DOMArrayPiece& data)
 {
     RefPtrWillBeRawPtr<CryptoResultImpl> result = CryptoResultImpl::create(scriptState);
     ScriptPromise promise = result->promise();
 
     if (!canAccessWebCrypto(scriptState, result.get()))
         return promise;
 
-    if (!ensureNotNull(data, "dataBuffer", result.get()))
-        return promise;
-
     WebCryptoAlgorithm algorithm;
     if (!parseAlgorithm(rawAlgorithm, WebCryptoOperationDigest, algorithm, result.get()))
         return promise;
 
     Platform::current()->crypto()->digest(algorithm, data.bytes(), data.byteLength(), result->result());
     return promise;
 }
 
 ScriptPromise SubtleCrypto::generateKey(ScriptState* scriptState, const AlgorithmIdentifier& rawAlgorithm, bool extractable, const Vector<String>& rawKeyUsages)
 {
@@ skipping 16 matching lines @@
 }
 
 ScriptPromise SubtleCrypto::importKey(ScriptState* scriptState, const String& rawFormat, const ArrayBufferOrArrayBufferViewOrDictionary& keyData, const AlgorithmIdentifier& rawAlgorithm, bool extractable, const Vector<String>& rawKeyUsages)
 {
     RefPtrWillBeRawPtr<CryptoResultImpl> result = CryptoResultImpl::create(scriptState);
     ScriptPromise promise = result->promise();
 
     if (!canAccessWebCrypto(scriptState, result.get()))
         return promise;
 
-    if (!ensureNotNull(keyData, "keyData", result.get()))
-        return promise;
-
     WebCryptoKeyFormat format;
     if (!CryptoKey::parseFormat(rawFormat, format, result.get()))
         return promise;
 
     if (keyData.isDictionary()) {
         if (format != WebCryptoKeyFormatJwk) {
             result->completeWithError(WebCryptoErrorTypeData, "Key data must be a buffer for non-JWK formats");
             return promise;
         }
     } else if (format == WebCryptoKeyFormatJwk) {
@@ skipping 30 matching lines @@
 }
 
 ScriptPromise SubtleCrypto::exportKey(ScriptState* scriptState, const String& rawFormat, CryptoKey* key)
 {
     RefPtrWillBeRawPtr<CryptoResultImpl> result = CryptoResultImpl::create(scriptState);
     ScriptPromise promise = result->promise();
 
     if (!canAccessWebCrypto(scriptState, result.get()))
         return promise;
 
-    if (!ensureNotNull(key, "key", result.get()))
-        return promise;
-
     WebCryptoKeyFormat format;
     if (!CryptoKey::parseFormat(rawFormat, format, result.get()))
         return promise;
 
     if (!key->extractable()) {
         result->completeWithError(WebCryptoErrorTypeInvalidAccess, "key is not extractable");
         return promise;
     }
 
     Platform::current()->crypto()->exportKey(format, key->key(), result->result());
     return promise;
 }
 
 ScriptPromise SubtleCrypto::wrapKey(ScriptState* scriptState, const String& rawFormat, CryptoKey* key, CryptoKey* wrappingKey, const AlgorithmIdentifier& rawWrapAlgorithm)
 {
     RefPtrWillBeRawPtr<CryptoResultImpl> result = CryptoResultImpl::create(scriptState);
     ScriptPromise promise = result->promise();
 
     if (!canAccessWebCrypto(scriptState, result.get()))
         return promise;
 
-    if (!ensureNotNull(key, "key", result.get()))
-        return promise;
-
-    if (!ensureNotNull(wrappingKey, "wrappingKey", result.get()))
-        return promise;
-
     WebCryptoKeyFormat format;
     if (!CryptoKey::parseFormat(rawFormat, format, result.get()))
         return promise;
 
     WebCryptoAlgorithm wrapAlgorithm;
     if (!parseAlgorithm(rawWrapAlgorithm, WebCryptoOperationWrapKey, wrapAlgorithm, result.get()))
         return promise;
 
     if (!key->extractable()) {
         result->completeWithError(WebCryptoErrorTypeInvalidAccess, "key is not extractable");
         return promise;
     }
 
     if (!wrappingKey->canBeUsedForAlgorithm(wrapAlgorithm, WebCryptoKeyUsageWrapKey, result.get()))
         return promise;
 
     Platform::current()->crypto()->wrapKey(format, key->key(), wrappingKey->key(), wrapAlgorithm, result->result());
     return promise;
 }
 
 ScriptPromise SubtleCrypto::unwrapKey(ScriptState* scriptState, const String& rawFormat, const DOMArrayPiece& wrappedKey, CryptoKey* unwrappingKey, const AlgorithmIdentifier& rawUnwrapAlgorithm, const AlgorithmIdentifier& rawUnwrappedKeyAlgorithm, bool extractable, const Vector<String>& rawKeyUsages)
 {
     RefPtrWillBeRawPtr<CryptoResultImpl> result = CryptoResultImpl::create(scriptState);
     ScriptPromise promise = result->promise();
 
     if (!canAccessWebCrypto(scriptState, result.get()))
         return promise;
 
-    if (!ensureNotNull(wrappedKey, "wrappedKey", result.get()))
-        return promise;
-    if (!ensureNotNull(unwrappingKey, "unwrappingKey", result.get()))
-        return promise;
-
     WebCryptoKeyFormat format;
     if (!CryptoKey::parseFormat(rawFormat, format, result.get()))
         return promise;
 
     WebCryptoKeyUsageMask keyUsages;
     if (!CryptoKey::parseUsageMask(rawKeyUsages, keyUsages, result.get()))
         return promise;
 
     WebCryptoAlgorithm unwrapAlgorithm;
     if (!parseAlgorithm(rawUnwrapAlgorithm, WebCryptoOperationUnwrapKey, unwrapAlgorithm, result.get()))
@@ skipping 11 matching lines @@
 }
 
 ScriptPromise SubtleCrypto::deriveBits(ScriptState* scriptState, const AlgorithmIdentifier& rawAlgorithm, CryptoKey* baseKey, unsigned lengthBits)
 {
     RefPtrWillBeRawPtr<CryptoResultImpl> result = CryptoResultImpl::create(scriptState);
     ScriptPromise promise = result->promise();
 
     if (!canAccessWebCrypto(scriptState, result.get()))
         return promise;
 
-    if (!ensureNotNull(baseKey, "baseKey", result.get()))
-        return promise;
-
     WebCryptoAlgorithm algorithm;
     if (!parseAlgorithm(rawAlgorithm, WebCryptoOperationDeriveBits, algorithm, result.get()))
         return promise;
 
     if (!baseKey->canBeUsedForAlgorithm(algorithm, WebCryptoKeyUsageDeriveBits, result.get()))
         return promise;
 
     Platform::current()->crypto()->deriveBits(algorithm, baseKey->key(), lengthBits, result->result());
     return promise;
 }
 
 ScriptPromise SubtleCrypto::deriveKey(ScriptState* scriptState, const AlgorithmIdentifier& rawAlgorithm, CryptoKey* baseKey, const AlgorithmIdentifier& rawDerivedKeyType, bool extractable, const Vector<String>& rawKeyUsages)
 {
     RefPtr<CryptoResultImpl> result = CryptoResultImpl::create(scriptState);
     ScriptPromise promise = result->promise();
 
     if (!canAccessWebCrypto(scriptState, result.get()))
         return promise;
 
-    if (!ensureNotNull(baseKey, "baseKey", result.get()))
-        return promise;
-
     WebCryptoKeyUsageMask keyUsages;
     if (!CryptoKey::parseUsageMask(rawKeyUsages, keyUsages, result.get()))
         return promise;
 
     WebCryptoAlgorithm algorithm;
     if (!parseAlgorithm(rawAlgorithm, WebCryptoOperationDeriveBits, algorithm, result.get()))
         return promise;
 
     if (!baseKey->canBeUsedForAlgorithm(algorithm, WebCryptoKeyUsageDeriveKey, result.get()))
         return promise;
 
     WebCryptoAlgorithm importAlgorithm;
     if (!parseAlgorithm(rawDerivedKeyType, WebCryptoOperationImportKey, importAlgorithm, result.get()))
         return promise;
 
     WebCryptoAlgorithm keyLengthAlgorithm;
     if (!parseAlgorithm(rawDerivedKeyType, WebCryptoOperationGetKeyLength, keyLengthAlgorithm, result.get()))
         return promise;
 
     Platform::current()->crypto()->deriveKey(algorithm, baseKey->key(), importAlgorithm, keyLengthAlgorithm, extractable, keyUsages, result->result());
     return promise;
 }
 
 } // namespace blink