jose 4.9.1 → 4.9.3

package/dist/browser/jwe/flattened/decrypt.js

@@ -95,10 +95,10 @@ export async function flattenedDecrypt(jwe, key, options) {
     }
     let cek;
     try {
-        cek = await decryptKeyManagement(alg, key, encryptedKey, joseHeader);
+        cek = await decryptKeyManagement(alg, key, encryptedKey, joseHeader, options);
     }
     catch (err) {
-        if (err instanceof TypeError) {
+        if (err instanceof TypeError || err instanceof JWEInvalid || err instanceof JOSENotSupported) {
             throw err;
         }
         cek = generateCek(enc);

package/dist/browser/lib/check_key_type.js

@@ -1,18 +1,18 @@
-import invalidKeyInput from './invalid_key_input.js';
+import { withAlg as invalidKeyInput } from './invalid_key_input.js';
 import isKeyLike, { types } from '../runtime/is_key_like.js';
-const symmetricTypeCheck = (key) => {
+const symmetricTypeCheck = (alg, key) => {
     if (key instanceof Uint8Array)
         return;
     if (!isKeyLike(key)) {
-        throw new TypeError(invalidKeyInput(key, ...types, 'Uint8Array'));
+        throw new TypeError(invalidKeyInput(alg, key, ...types, 'Uint8Array'));
     }
     if (key.type !== 'secret') {
         throw new TypeError(`${types.join(' or ')} instances for symmetric algorithms must be of type "secret"`);
     }
 };
-const asymmetricTypeCheck = (key, usage) => {
+const asymmetricTypeCheck = (alg, key, usage) => {
     if (!isKeyLike(key)) {
-        throw new TypeError(invalidKeyInput(key, ...types));
+        throw new TypeError(invalidKeyInput(alg, key, ...types));
     }
     if (key.type === 'secret') {
         throw new TypeError(`${types.join(' or ')} instances for asymmetric algorithms must not be of type "secret"`);
@@ -36,10 +36,10 @@ const checkKeyType = (alg, key, usage) => {
         alg.startsWith('PBES2') ||
         /^A\d{3}(?:GCM)?KW$/.test(alg);
     if (symmetric) {
-        symmetricTypeCheck(key);
+        symmetricTypeCheck(alg, key);
     }
     else {
-        asymmetricTypeCheck(key, usage);
+        asymmetricTypeCheck(alg, key, usage);
     }
 };
 export default checkKeyType;

package/dist/browser/lib/decrypt_key_management.js

@@ -9,7 +9,7 @@ import { importJWK } from '../key/import.js';
 import checkKeyType from './check_key_type.js';
 import isObject from './is_object.js';
 import { unwrap as aesGcmKw } from './aesgcmkw.js';
-async function decryptKeyManagement(alg, key, encryptedKey, joseHeader) {
+async function decryptKeyManagement(alg, key, encryptedKey, joseHeader, options) {
     checkKeyType(alg, key, 'decrypt');
     switch (alg) {
         case 'dir': {
@@ -63,6 +63,9 @@ async function decryptKeyManagement(alg, key, encryptedKey, joseHeader) {
                 throw new JWEInvalid('JWE Encrypted Key missing');
             if (typeof joseHeader.p2c !== 'number')
                 throw new JWEInvalid(`JOSE Header "p2c" (PBES2 Count) missing or invalid`);
+            const p2cLimit = (options === null || options === void 0 ? void 0 : options.maxPBES2Count) || 10000;
+            if (joseHeader.p2c > p2cLimit)
+                throw new JWEInvalid(`JOSE Header "p2c" (PBES2 Count) out is of acceptable bounds`);
             if (typeof joseHeader.p2s !== 'string')
                 throw new JWEInvalid(`JOSE Header "p2s" (PBES2 Salt) missing or invalid`);
             return pbes2Kw(alg, key, encryptedKey, joseHeader.p2c, base64url(joseHeader.p2s));

package/dist/browser/lib/invalid_key_input.js

@@ -1,5 +1,4 @@
-export default (actual, ...types) => {
-    let msg = 'Key must be ';
+function message(msg, actual, ...types) {
     if (types.length > 2) {
         const last = types.pop();
         msg += `one of type ${types.join(', ')}, or ${last}.`;
@@ -22,4 +21,10 @@ export default (actual, ...types) => {
         }
     }
     return msg;
+}
+export default (actual, ...types) => {
+    return message('Key must be ', actual, ...types);
 };
+export function withAlg(alg, actual, ...types) {
+    return message(`Key for the ${alg} algorithm must be `, actual, ...types);
+}

package/dist/browser/runtime/check_cek_length.js

@@ -1,7 +1,8 @@
 import { JWEInvalid } from '../util/errors.js';
 const checkCekLength = (cek, expected) => {
-    if (cek.length << 3 !== expected) {
-        throw new JWEInvalid('Invalid Content Encryption Key length');
+    const actual = cek.byteLength << 3;
+    if (actual !== expected) {
+        throw new JWEInvalid(`Invalid Content Encryption Key length. Expected ${expected} bits, got ${actual} bits`);
     }
 };
 export default checkCekLength;

package/dist/node/cjs/jwe/flattened/decrypt.js

@@ -98,10 +98,10 @@ async function flattenedDecrypt(jwe, key, options) {
     }
     let cek;
     try {
-        cek = await (0, decrypt_key_management_js_1.default)(alg, key, encryptedKey, joseHeader);
+        cek = await (0, decrypt_key_management_js_1.default)(alg, key, encryptedKey, joseHeader, options);
     }
     catch (err) {
-        if (err instanceof TypeError) {
+        if (err instanceof TypeError || err instanceof errors_js_1.JWEInvalid || err instanceof errors_js_1.JOSENotSupported) {
             throw err;
         }
         cek = (0, cek_js_1.default)(enc);

package/dist/node/cjs/lib/check_key_type.js

@@ -2,19 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const invalid_key_input_js_1 = require("./invalid_key_input.js");
 const is_key_like_js_1 = require("../runtime/is_key_like.js");
-const symmetricTypeCheck = (key) => {
+const symmetricTypeCheck = (alg, key) => {
     if (key instanceof Uint8Array)
         return;
     if (!(0, is_key_like_js_1.default)(key)) {
-        throw new TypeError((0, invalid_key_input_js_1.default)(key, ...is_key_like_js_1.types, 'Uint8Array'));
+        throw new TypeError((0, invalid_key_input_js_1.withAlg)(alg, key, ...is_key_like_js_1.types, 'Uint8Array'));
     }
     if (key.type !== 'secret') {
         throw new TypeError(`${is_key_like_js_1.types.join(' or ')} instances for symmetric algorithms must be of type "secret"`);
     }
 };
-const asymmetricTypeCheck = (key, usage) => {
+const asymmetricTypeCheck = (alg, key, usage) => {
     if (!(0, is_key_like_js_1.default)(key)) {
-        throw new TypeError((0, invalid_key_input_js_1.default)(key, ...is_key_like_js_1.types));
+        throw new TypeError((0, invalid_key_input_js_1.withAlg)(alg, key, ...is_key_like_js_1.types));
     }
     if (key.type === 'secret') {
         throw new TypeError(`${is_key_like_js_1.types.join(' or ')} instances for asymmetric algorithms must not be of type "secret"`);
@@ -38,10 +38,10 @@ const checkKeyType = (alg, key, usage) => {
         alg.startsWith('PBES2') ||
         /^A\d{3}(?:GCM)?KW$/.test(alg);
     if (symmetric) {
-        symmetricTypeCheck(key);
+        symmetricTypeCheck(alg, key);
     }
     else {
-        asymmetricTypeCheck(key, usage);
+        asymmetricTypeCheck(alg, key, usage);
     }
 };
 exports.default = checkKeyType;

package/dist/node/cjs/lib/decrypt_key_management.js

@@ -11,7 +11,7 @@ const import_js_1 = require("../key/import.js");
 const check_key_type_js_1 = require("./check_key_type.js");
 const is_object_js_1 = require("./is_object.js");
 const aesgcmkw_js_1 = require("./aesgcmkw.js");
-async function decryptKeyManagement(alg, key, encryptedKey, joseHeader) {
+async function decryptKeyManagement(alg, key, encryptedKey, joseHeader, options) {
     (0, check_key_type_js_1.default)(alg, key, 'decrypt');
     switch (alg) {
         case 'dir': {
@@ -65,6 +65,9 @@ async function decryptKeyManagement(alg, key, encryptedKey, joseHeader) {
                 throw new errors_js_1.JWEInvalid('JWE Encrypted Key missing');
             if (typeof joseHeader.p2c !== 'number')
                 throw new errors_js_1.JWEInvalid(`JOSE Header "p2c" (PBES2 Count) missing or invalid`);
+            const p2cLimit = (options === null || options === void 0 ? void 0 : options.maxPBES2Count) || 10000;
+            if (joseHeader.p2c > p2cLimit)
+                throw new errors_js_1.JWEInvalid(`JOSE Header "p2c" (PBES2 Count) out is of acceptable bounds`);
             if (typeof joseHeader.p2s !== 'string')
                 throw new errors_js_1.JWEInvalid(`JOSE Header "p2s" (PBES2 Salt) missing or invalid`);
             return (0, pbes2kw_js_1.decrypt)(alg, key, encryptedKey, joseHeader.p2c, (0, base64url_js_1.decode)(joseHeader.p2s));

package/dist/node/cjs/lib/invalid_key_input.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = (actual, ...types) => {
-    let msg = 'Key must be ';
+exports.withAlg = void 0;
+function message(msg, actual, ...types) {
     if (types.length > 2) {
         const last = types.pop();
         msg += `one of type ${types.join(', ')}, or ${last}.`;
@@ -24,4 +24,11 @@ exports.default = (actual, ...types) => {
         }
     }
     return msg;
+}
+exports.default = (actual, ...types) => {
+    return message('Key must be ', actual, ...types);
 };
+function withAlg(alg, actual, ...types) {
+    return message(`Key for the ${alg} algorithm must be `, actual, ...types);
+}
+exports.withAlg = withAlg;

package/dist/node/cjs/runtime/check_cek_length.js

@@ -19,14 +19,16 @@ const checkCekLength = (enc, cek) => {
             throw new errors_js_1.JOSENotSupported(`Content Encryption Algorithm ${enc} is not supported either by JOSE or your javascript runtime`);
     }
     if (cek instanceof Uint8Array) {
-        if (cek.length << 3 !== expected) {
-            throw new errors_js_1.JWEInvalid('Invalid Content Encryption Key length');
+        const actual = cek.byteLength << 3;
+        if (actual !== expected) {
+            throw new errors_js_1.JWEInvalid(`Invalid Content Encryption Key length. Expected ${expected} bits, got ${actual} bits`);
         }
         return;
     }
     if ((0, is_key_object_js_1.default)(cek) && cek.type === 'secret') {
-        if (cek.symmetricKeySize << 3 !== expected) {
-            throw new errors_js_1.JWEInvalid('Invalid Content Encryption Key length');
+        const actual = cek.symmetricKeySize << 3;
+        if (actual !== expected) {
+            throw new errors_js_1.JWEInvalid(`Invalid Content Encryption Key length. Expected ${expected} bits, got ${actual} bits`);
         }
         return;
     }

package/dist/node/esm/jwe/flattened/decrypt.js

@@ -95,10 +95,10 @@ export async function flattenedDecrypt(jwe, key, options) {
     }
     let cek;
     try {
-        cek = await decryptKeyManagement(alg, key, encryptedKey, joseHeader);
+        cek = await decryptKeyManagement(alg, key, encryptedKey, joseHeader, options);
     }
     catch (err) {
-        if (err instanceof TypeError) {
+        if (err instanceof TypeError || err instanceof JWEInvalid || err instanceof JOSENotSupported) {
             throw err;
         }
         cek = generateCek(enc);

package/dist/node/esm/lib/check_key_type.js

@@ -1,18 +1,18 @@
-import invalidKeyInput from './invalid_key_input.js';
+import { withAlg as invalidKeyInput } from './invalid_key_input.js';
 import isKeyLike, { types } from '../runtime/is_key_like.js';
-const symmetricTypeCheck = (key) => {
+const symmetricTypeCheck = (alg, key) => {
     if (key instanceof Uint8Array)
         return;
     if (!isKeyLike(key)) {
-        throw new TypeError(invalidKeyInput(key, ...types, 'Uint8Array'));
+        throw new TypeError(invalidKeyInput(alg, key, ...types, 'Uint8Array'));
     }
     if (key.type !== 'secret') {
         throw new TypeError(`${types.join(' or ')} instances for symmetric algorithms must be of type "secret"`);
     }
 };
-const asymmetricTypeCheck = (key, usage) => {
+const asymmetricTypeCheck = (alg, key, usage) => {
     if (!isKeyLike(key)) {
-        throw new TypeError(invalidKeyInput(key, ...types));
+        throw new TypeError(invalidKeyInput(alg, key, ...types));
     }
     if (key.type === 'secret') {
         throw new TypeError(`${types.join(' or ')} instances for asymmetric algorithms must not be of type "secret"`);
@@ -36,10 +36,10 @@ const checkKeyType = (alg, key, usage) => {
         alg.startsWith('PBES2') ||
         /^A\d{3}(?:GCM)?KW$/.test(alg);
     if (symmetric) {
-        symmetricTypeCheck(key);
+        symmetricTypeCheck(alg, key);
     }
     else {
-        asymmetricTypeCheck(key, usage);
+        asymmetricTypeCheck(alg, key, usage);
     }
 };
 export default checkKeyType;

package/dist/node/esm/lib/decrypt_key_management.js

@@ -9,7 +9,7 @@ import { importJWK } from '../key/import.js';
 import checkKeyType from './check_key_type.js';
 import isObject from './is_object.js';
 import { unwrap as aesGcmKw } from './aesgcmkw.js';
-async function decryptKeyManagement(alg, key, encryptedKey, joseHeader) {
+async function decryptKeyManagement(alg, key, encryptedKey, joseHeader, options) {
     checkKeyType(alg, key, 'decrypt');
     switch (alg) {
         case 'dir': {
@@ -63,6 +63,9 @@ async function decryptKeyManagement(alg, key, encryptedKey, joseHeader) {
                 throw new JWEInvalid('JWE Encrypted Key missing');
             if (typeof joseHeader.p2c !== 'number')
                 throw new JWEInvalid(`JOSE Header "p2c" (PBES2 Count) missing or invalid`);
+            const p2cLimit = (options === null || options === void 0 ? void 0 : options.maxPBES2Count) || 10000;
+            if (joseHeader.p2c > p2cLimit)
+                throw new JWEInvalid(`JOSE Header "p2c" (PBES2 Count) out is of acceptable bounds`);
             if (typeof joseHeader.p2s !== 'string')
                 throw new JWEInvalid(`JOSE Header "p2s" (PBES2 Salt) missing or invalid`);
             return pbes2Kw(alg, key, encryptedKey, joseHeader.p2c, base64url(joseHeader.p2s));

package/dist/node/esm/lib/invalid_key_input.js

@@ -1,5 +1,4 @@
-export default (actual, ...types) => {
-    let msg = 'Key must be ';
+function message(msg, actual, ...types) {
     if (types.length > 2) {
         const last = types.pop();
         msg += `one of type ${types.join(', ')}, or ${last}.`;
@@ -22,4 +21,10 @@ export default (actual, ...types) => {
         }
     }
     return msg;
+}
+export default (actual, ...types) => {
+    return message('Key must be ', actual, ...types);
 };
+export function withAlg(alg, actual, ...types) {
+    return message(`Key for the ${alg} algorithm must be `, actual, ...types);
+}

package/dist/node/esm/runtime/check_cek_length.js

@@ -17,14 +17,16 @@ const checkCekLength = (enc, cek) => {
             throw new JOSENotSupported(`Content Encryption Algorithm ${enc} is not supported either by JOSE or your javascript runtime`);
     }
     if (cek instanceof Uint8Array) {
-        if (cek.length << 3 !== expected) {
-            throw new JWEInvalid('Invalid Content Encryption Key length');
+        const actual = cek.byteLength << 3;
+        if (actual !== expected) {
+            throw new JWEInvalid(`Invalid Content Encryption Key length. Expected ${expected} bits, got ${actual} bits`);
         }
         return;
     }
     if (isKeyObject(cek) && cek.type === 'secret') {
-        if (cek.symmetricKeySize << 3 !== expected) {
-            throw new JWEInvalid('Invalid Content Encryption Key length');
+        const actual = cek.symmetricKeySize << 3;
+        if (actual !== expected) {
+            throw new JWEInvalid(`Invalid Content Encryption Key length. Expected ${expected} bits, got ${actual} bits`);
         }
         return;
     }

package/dist/types/types.d.ts

@@ -20,8 +20,8 @@
  * obtain a KeyObject from your existing key material.
  *
  * [CryptoKey](https://developer.mozilla.org/en-US/docs/Web/API/CryptoKey) is a representation of a
- * key/secret available in the Browser and Deno runtimes. In addition to the import functions of
- * this library you may use the
+ * key/secret available in the Browser and Web-interoperable runtimes. In addition to the import
+ * functions of this library you may use the
  * [SubtleCrypto.importKey](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey)
  * API to obtain a CryptoKey from your existing key material.
  *
@@ -401,6 +401,13 @@ export interface DecryptOptions extends CritOption {
    * with compressed plaintext.
    */
   inflateRaw?: InflateFunction
+
+  /**
+   * (PBES2 Key Management Algorithms only) Maximum allowed "p2c" (PBES2 Count) Header Parameter
+   * value. The PBKDF2 iteration count defines the algorithm's computational expense. By default
+   * this value is set to 10000.
+   */
+  maxPBES2Count?: number
 }
 
 /** JWE Deflate option. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jose",
-  "version": "4.9.1",
+  "version": "4.9.3",
   "description": "'JSON Web Almost Everything' - JWA, JWS, JWE, JWT, JWK, JWKS with no dependencies using runtime's native crypto",
   "keywords": [
     "browser",