Update: configure if embedded keys can be used for signature verification (#147)

Author: linuxwolf

README.md

@@ -422,15 +422,26 @@ To verify using a key embedded in the JWS:
 
 ```javascript
 jose.JWS.createVerify().
-        verify(input).
+        verify(input, { allowEmbeddedKey: true }).
         then(function(result) {
           // ...
         });
 ```
 
+Alternatively, a cached `createVerify()` can be configured to allow an embedded key:
+
+```javascript
+var verifier = jose.JWS.createVerify({ allowEmbeddedKey: true });
+
+verifier.verify(input).
+         then(function(result) {
+           // ...
+         });
+```
+
 The key can be embedded using either 'jwk' or 'x5c', and can be located in either the JWS Unprotected Header or JWS Protected Header.
 
-**NOTE:** `verify()` will use the embedded key (if found) instead of any other key.
+**NOTE:** `verify()` will use the embedded key (if found and permitted) instead of any other key.
 
 #### Handling `crit` Header Members ####
 

lib/jws/verify.js

@@ -31,7 +31,7 @@ var JWSVerifier = function(ks, globalOpts) {
     keystore = JWK.createKeyStore();
   }
 
-  globalOpts = merge({}, globalOpts);
+  globalOpts = merge({ allowEmbeddedKey: false }, globalOpts);
 
   Object.defineProperty(this, "defaultKey", {
     value: assumedKey || undefined,
@@ -128,9 +128,9 @@ var JWSVerifier = function(ks, globalOpts) {
             p = p.then(function(sig) {
               var algKey;
               // TODO: resolve jku, x5c, x5u
-              if (sig.header.jwk) {
+              if (opts.allowEmbeddedKey && sig.header.jwk) {
                 algKey = JWK.asKey(sig.header.jwk);
-              } else if (sig.header.x5c) {
+              } else if (opts.allowEmbeddedKey && sig.header.x5c) {
                 algKey = sig.header.x5c[0];
                 algKey = new Buffer(algKey, "base64");
                 // TODO: callback to validate chain
@@ -247,8 +247,8 @@ var JWSVerifier = function(ks, globalOpts) {
  * @param {JWK.Key|JWK.KeyStore} ks The Key or KeyStore to use for verification.
  * @returns {JWS.Verifier} The new Verifier.
  */
-function createVerify(ks) {
-  var vfy = new JWSVerifier(ks);
+function createVerify(ks, opts) {
+  var vfy = new JWSVerifier(ks, opts);
 
   return vfy;
 }

lib/parse/compact.js

@@ -19,16 +19,16 @@ function parseCompact(input) {
   if (3 === parts.length) {
     // JWS
     type = "JWS";
-    op = function(ks) {
+    op = function(ks, opts) {
       return jose.JWS.createVerify(ks).
-             verify(input);
+             verify(input, opts);
     };
   } else if (5 === parts.length) {
     // JWE
     type = "JWE";
-    op = function(ks) {
+    op = function(ks, opts) {
       return jose.JWE.createDecrypt(ks).
-             decrypt(input);
+             decrypt(input, opts);
     };
   } else {
     throw new TypeError("invalid jose serialization");

lib/parse/json.js

@@ -21,9 +21,9 @@ function parseJSON(input) {
   if ("signatures" in input || "signature" in input) {
     // JWS
     type = "JWS";
-    op = function(ks) {
+    op = function(ks, opts) {
       return jose.JWS.createVerify(ks).
-             verify(input);
+             verify(input, opts);
     };
     // headers can be (signatures[].protected, signatures[].header, signature.protected, signature.header)
     headers = input.signatures ||
@@ -51,9 +51,9 @@ function parseJSON(input) {
   } else if ("ciphertext" in input) {
     // JWE
     type = "JWE";
-    op = function(ks) {
+    op = function(ks, opts) {
       return jose.JWE.createDecrypt(ks).
-             decrypt(input);
+             decrypt(input, opts);
     };
     // headers can be (protected, unprotected, recipients[].header)
     var root = {};