chrome.platformKeys: Require a algorithm name to getKeyPair().

This makes the algorithm name a mandatory argument of getKeyPair().
In a later CL, this name will be compared with the key restrictions that the certificate puts onto the key usage.

BUG=466584

Review URL: https://codereview.chromium.org/1001853003

Cr-Commit-Position: refs/heads/master@{#321956}

chrome/renderer/resources/extensions/platform_keys/get_public_key.js

@@ -7,44 +7,56 @@ var internalAPI = require('platformKeys.internalAPI');
 var normalizeAlgorithm =
     requireNative('platform_keys_natives').NormalizeAlgorithm;
 
-function combineAlgorithms(algorithm, importParams) {
-  if (importParams.name === undefined) {
-    importParams.name = algorithm.name;
+// Returns the normalized parameters of |importParams|.
+// Any unknown parameters will be ignored.
+function normalizeImportParams(importParams) {
+  if (!importParams.name ||
+      Object.prototype.toString.call(importParams.name) != '[object String]') {
+    throw new Error('Algorithm: name: Missing or not a String');
   }
 
-  // Verify whether importParams.hash equals
-  //   { name: 'none' }
-  if (importParams.hash &&
-      importParams.hash.name.toLowerCase() === 'none') {
-    if (Object.keys(importParams.hash).length != 1 ||
-        Object.keys(importParams).length != 2) {
-      // 'name' must be the only hash property in this case.
-      throw new Error('A required parameter was missing or out-of-range');
-    }
-    importParams.hash.name = 'none';
-  } else {
-    // Otherwise apply WebCrypto's algorithm normalization.
-    importParams = normalizeAlgorithm(importParams, 'ImportKey');
-    if (!importParams) {
-      //    throw CreateSyntaxError();
-      throw new Error('A required parameter was missing or out-of-range');
+  var filteredParams = { name: importParams.name };
+
+  var hashIsNone = false;
+  if (importParams.hash) {
+    if (importParams.hash.name.toLowerCase() === 'none') {
+      hashIsNone = true;
+      // Temporarily replace |hash| by a valid WebCrypto Hash for normalization.
+      // This will be reverted to 'none' after normalization.
+      filteredParams.hash = { name: 'SHA-1' };
+    } else {
+      filteredParams.hash = { name: importParams.hash.name }
     }
   }
 
+  // Apply WebCrypto's algorithm normalization.
+  var resultParams = normalizeAlgorithm(filteredParams, 'ImportKey');
+  if (!resultParams ) {
+    throw new Error('A required parameter was missing or out-of-range');
+  }
+  if (hashIsNone) {
+    resultParams.hash = { name: 'none' };
+  }
+  return resultParams;
+}
+
+function combineAlgorithms(algorithm, importParams) {
   // internalAPI.getPublicKey returns publicExponent as ArrayBuffer, but it
   // should be a Uint8Array.
   if (algorithm.publicExponent) {
     algorithm.publicExponent = new Uint8Array(algorithm.publicExponent);
   }
 
-  for (var key in importParams) {
-    algorithm[key] = importParams[key];
-  }
-
+  algorithm.hash = importParams.hash;
   return algorithm;
 }
 
 function getPublicKey(cert, importParams, callback) {
+  importParams = normalizeImportParams(importParams);
+  // TODO(pneubeck): pass importParams.name to the internal getPublicKey and
+  // verify on the C++ side that the requested algorithm is compatible with the
+  // given SubjectPublicKeyInfo of the certificate.
+  // https://crbug.com/466584
   internalAPI.getPublicKey(cert, function(publicKey, algorithm) {
     var combinedAlgorithm = combineAlgorithms(algorithm, importParams);
     callback(publicKey, combinedAlgorithm);

chrome/test/data/extensions/api_test/platform_keys/basic.js

@@ -180,14 +180,12 @@ function testStaticMethods() {
   assertTrue(!!chrome.platformKeys, "No platformKeys namespace.");
   assertTrue(!!chrome.platformKeys.selectClientCertificates,
              "No selectClientCertificates function.");
-  succeed();
-}
-
-function testHasSubtleCryptoMethods(token) {
-  assertTrue(!!token.subtleCrypto.generateKey,
-             "token has no generateKey method");
-  assertTrue(!!token.subtleCrypto.sign, "token has no sign method");
-  assertTrue(!!token.subtleCrypto.exportKey, "token has no exportKey method");
+  assertTrue(!!chrome.platformKeys.getKeyPair, "No getKeyPair method.");
+  assertTrue(!!chrome.platformKeys.subtleCrypto, "No subtleCrypto getter.");
+  assertTrue(!!chrome.platformKeys.subtleCrypto(), "No subtleCrypto object.");
+  assertTrue(!!chrome.platformKeys.subtleCrypto().sign, "No sign method.");
+  assertTrue(!!chrome.platformKeys.subtleCrypto().exportKey,
+             "No exportKey method.");
   succeed();
 }
 
@@ -252,10 +250,28 @@ function testMatchResult() {
       }));
 }
 
+function testGetKeyPairMissingAlgorithName() {
+  var keyParams = {
+    // This is missing the algorithm name.
+    hash: {name: 'SHA-1'}
+  };
+  try {
+    chrome.platformKeys.getKeyPair(
+        data.client_1.buffer, keyParams, function(error) {
+          fail('getKeyPair call was expected to fail.');
+        });
+    fail('getKeyPair did not throw error');
+  } catch (e) {
+    assertEq('Algorithm: name: Missing or not a String', e.message);
+    succeed();
+  }
+}
+
 function testGetKeyPair() {
   var keyParams = {
     // Algorithm names are case-insensitive.
-    'hash': {'name': 'sha-1'}
+    name: 'RSASSA-Pkcs1-V1_5',
+    hash: {name: 'sha-1'}
   };
   chrome.platformKeys.getKeyPair(
       data.client_1.buffer, keyParams,
@@ -286,6 +302,7 @@ function testGetKeyPair() {
 function testSignNoHash() {
   var keyParams = {
     // Algorithm names are case-insensitive.
+    name: 'RSASSA-PKCS1-V1_5',
     hash: {name: 'NONE'}
   };
   var signParams = {
@@ -307,6 +324,7 @@ function testSignNoHash() {
 
 function testSignSha1Client1() {
   var keyParams = {
+    name: 'RSASSA-PKCS1-v1_5',
     // Algorithm names are case-insensitive.
     hash: {name: 'Sha-1'}
   };
@@ -332,6 +350,7 @@ function testSignSha1Client1() {
 // that's implemented.
 function testSignFails(cert) {
   var keyParams = {
+    name: 'RSASSA-PKCS1-v1_5',
     hash: {name: 'SHA-1'}
   };
   var signParams = {
@@ -370,6 +389,7 @@ var testSuites = {
       testSelectCA1Certs,
       testInteractiveSelectNoCerts,
       testMatchResult,
+      testGetKeyPairMissingAlgorithName,
       testGetKeyPair,
       testSignNoHash,
       testSignSha1Client1,