[webcrypto] Require importKey() for JWK to provide data as a Javascript object rather than a JSON a…

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 18 matching lines @@
  */
 
 #include "config.h"
 #include "modules/crypto/SubtleCrypto.h"
 
 #include "bindings/v8/Dictionary.h"
 #include "core/dom/ExecutionContext.h"
 #include "modules/crypto/CryptoResultImpl.h"
 #include "modules/crypto/Key.h"
 #include "modules/crypto/NormalizeAlgorithm.h"
+#include "platform/JSONValues.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebCrypto.h"
 #include "public/platform/WebCryptoAlgorithm.h"
 #include "wtf/ArrayBufferView.h"
 
 namespace WebCore {
 
 // 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 ArrayPiece& x, const char* paramName, CryptoResult* result)
 {
     if (x.isNull()) {
         String message = String("Invalid ") + paramName + String(" argument");
         result->completeWithError(blink::WebCryptoErrorTypeType, blink::WebString(message));
         return false;
     }
     return true;
 }
 
 static bool ensureNotNull(Key* key, const char* paramName, CryptoResult* result)
 {
     if (!key) {
         String message = String("Invalid ") + paramName + String(" argument");
         result->completeWithError(blink::WebCryptoErrorTypeType, blink::WebString(message));
         return false;
     }
     return true;
 }
 
-bool parseAlgorithm(const Dictionary& raw, blink::WebCryptoOperation op, blink::WebCryptoAlgorithm& algorithm, CryptoResult* result)
+static bool parseAlgorithm(const Dictionary& raw, blink::WebCryptoOperation op, blink::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 50 matching lines @@
         blink::Platform::current()->crypto()->digest(algorithm, data, dataSize, result->result());
         break;
     default:
         ASSERT_NOT_REACHED();
         return ScriptPromise();
     }
 
     return promise;
 }
 
+static bool copyStringProperty(const char* property, const Dictionary& source, JSONObject* destination)
+{
+    String value;
+    if (!source.get(property, value))
+        return false;
+    destination->setString(property, value);
+    return true;
+}
+
+static bool copySequenceOfStringProperty(const char* property, const Dictionary& source, JSONObject* destination)
+{
+    Vector<String> value;
+    if (!source.get(property, value))
+        return false;
+    RefPtr<JSONArray> jsonArray = JSONArray::create();
+    for (unsigned i = 0; i < value.size(); ++i)
+        jsonArray->pushString(value[i]);
+    destination->setArray(property, jsonArray.release());
+    return true;
+}
+
+// FIXME: At the time of writing this is not a part of the spec. It is based an
+// an unpublished editor's draft for:
+//   https://www.w3.org/Bugs/Public/show_bug.cgi?id=24963
+// See http://crbug.com/373917.
+static bool copyJwkDictionaryToJson(const Dictionary& dict, CString& jsonUtf8, CryptoResult* result)
+{
+    RefPtr<JSONObject> jsonObject = JSONObject::create();
+
+    if (!copyStringProperty("kty", dict, jsonObject.get())) {
+        result->completeWithError(blink::WebCryptoErrorTypeData, "The required JWK property \"kty\" was missing");
+        return false;
+    }
+
+    copyStringProperty("use", dict, jsonObject.get());
+    copySequenceOfStringProperty("key_ops", dict, jsonObject.get());
+    copyStringProperty("alg", dict, jsonObject.get());
+
+    bool ext;
+    if (dict.get("ext", ext))
+        jsonObject->setBoolean("ext", ext);
+
+    const char* const propertyNames[] = { "d", "n", "e", "p", "q", "dp", "dq", "qi", "k" };
+    for (unsigned i = 0; i < WTF_ARRAY_LENGTH(propertyNames); ++i)
+        copyStringProperty(propertyNames[i], dict, jsonObject.get());
+
+    String json = jsonObject->toJSONString();
+    jsonUtf8 = json.utf8();
+    return true;
+}
+
 SubtleCrypto::SubtleCrypto()
 {
     ScriptWrappable::init(this);
 }
 
 ScriptPromise SubtleCrypto::encrypt(ScriptState* scriptState, const Dictionary& rawAlgorithm, Key* key, const ArrayPiece& data)
 {
     return startCryptoOperation(scriptState, rawAlgorithm, key, blink::WebCryptoOperationEncrypt, ArrayPiece(), data);
 }
 
@@ skipping 45 matching lines @@
     if (!canAccessWebCrypto(scriptState, result.get()))
         return promise;
 
     if (!ensureNotNull(keyData, "keyData", result.get()))
         return promise;
 
     blink::WebCryptoKeyFormat format;
     if (!Key::parseFormat(rawFormat, format, result.get()))
         return promise;
 
+    if (format == blink::WebCryptoKeyFormatJwk) {
+        result->completeWithError(blink::WebCryptoErrorTypeData, "Key data must be an object for JWK import");
+        return promise;
+    }
+
     blink::WebCryptoKeyUsageMask keyUsages;
     if (!Key::parseUsageMask(rawKeyUsages, keyUsages, result.get()))
         return promise;
 
     blink::WebCryptoAlgorithm algorithm;
     if (!parseAlgorithm(rawAlgorithm, blink::WebCryptoOperationImportKey, algorithm, result.get()))
         return promise;
 
     blink::Platform::current()->crypto()->importKey(format, keyData.bytes(), keyData.byteLength(), algorithm, extractable, keyUsages, result->result());
     return promise;
 }
 
+ScriptPromise SubtleCrypto::importKey(ScriptState* scriptState, const String& rawFormat, const Dictionary& keyData, const Dictionary& rawAlgorithm, bool extractable, const Vector<String>& rawKeyUsages)
+{
+    RefPtr<CryptoResultImpl> result = CryptoResultImpl::create(scriptState);
+    ScriptPromise promise = result->promise();
+
+    if (!canAccessWebCrypto(scriptState, result.get()))
+        return 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;
+
+    if (format != blink::WebCryptoKeyFormatJwk) {
+        result->completeWithError(blink::WebCryptoErrorTypeData, "Key data must be a buffer for non-JWK formats");
+        return promise;
+    }
+
+    blink::WebCryptoAlgorithm algorithm;
+    if (!parseAlgorithm(rawAlgorithm, blink::WebCryptoOperationImportKey, algorithm, result.get()))
+        return promise;
+
+    CString jsonUtf8;
+    if (!copyJwkDictionaryToJson(keyData, jsonUtf8, result.get()))
+        return promise;
+
+    blink::Platform::current()->crypto()->importKey(format, reinterpret_cast<const unsigned char*>(jsonUtf8.data()), jsonUtf8.length(), algorithm, extractable, keyUsages, result->result());
+    return promise;
+}
+
 ScriptPromise SubtleCrypto::exportKey(ScriptState* scriptState, const String& rawFormat, Key* key)
 {
     RefPtr<CryptoResultImpl> result = CryptoResultImpl::create(scriptState);
     ScriptPromise promise = result->promise();
 
     if (!canAccessWebCrypto(scriptState, result.get()))
         return promise;
 
     if (!ensureNotNull(key, "key", result.get()))
         return promise;
@@ skipping 75 matching lines @@
         return promise;
 
     if (!unwrappingKey->canBeUsedForAlgorithm(unwrapAlgorithm, blink::WebCryptoOperationUnwrapKey, result.get()))
         return promise;
 
     blink::Platform::current()->crypto()->unwrapKey(format, wrappedKey.bytes(), wrappedKey.byteLength(), unwrappingKey->key(), unwrapAlgorithm, unwrappedKeyAlgorithm, extractable, keyUsages, result->result());
     return promise;
 }
 
 } // namespace WebCore