jose 4.1.1 → 4.1.5

package/README.md

@@ -65,6 +65,7 @@ If you or your business use `jose`, please consider becoming a [sponsor][support
 - [Cloudflare Workers Support][]
 - [Deno Support][]
 - [Electron Support][]
+- [Next.js Middleware / Vercel Edge Functions Support][]
 - [Node.js Support][]
 
 ## FAQ
@@ -133,8 +134,10 @@ install size should not be a cause for concern.
 [webcrypto]: https://www.w3.org/TR/WebCryptoAPI/
 [nodewebcrypto]: https://nodejs.org/docs/latest-v15.x/api/webcrypto.html
 [deno.land/x/jose]: https://deno.land/x/jose
+
 [Browser Support]: https://github.com/panva/jose/issues/263
 [Cloudflare Workers Support]: https://github.com/panva/jose/issues/265
 [Deno Support]: https://github.com/panva/jose/issues/266
 [Electron Support]: https://github.com/panva/jose/issues/264
+[Next.js Middleware / Vercel Edge Functions Support]: https://github.com/panva/jose/issues/301
 [Node.js Support]: https://github.com/panva/jose/issues/262

package/dist/browser/key/import.js

@@ -62,7 +62,8 @@ function parseElement(bytes) {
     };
 }
 function spkiFromX509(buf) {
-    return encodeBase64(getElement(getElement(parseElement(buf).contents)[0].contents)[6].raw);
+    const tbsCertificate = getElement(getElement(parseElement(buf).contents)[0].contents);
+    return encodeBase64(tbsCertificate[tbsCertificate[0].raw[0] === 0xa0 ? 6 : 5].raw);
 }
 function getSPKI(x509) {
     const pem = x509.replace(/(?:-----(?:BEGIN|END) CERTIFICATE-----|\s)/g, '');

package/dist/browser/lib/crypto_key.js

@@ -1,4 +1,4 @@
-import { isCloudflareWorkers, isNodeJs } from '../runtime/global.js';
+import { isCloudflareWorkers, isNodeJs } from '../runtime/env.js';
 function unusable(name, prop = 'algorithm.name') {
     return new TypeError(`CryptoKey does not support this operation, its ${prop} must be ${name}`);
 }

package/dist/browser/runtime/asn1.js

@@ -1,4 +1,4 @@
-import globalThis, { isCloudflareWorkers, isNodeJs } from './global.js';
+import { isCloudflareWorkers, isNodeJs } from './env.js';
 import crypto, { isCryptoKey } from './webcrypto.js';
 import invalidKeyInput from '../lib/invalid_key_input.js';
 import { encodeBase64 } from './base64url.js';
@@ -54,8 +54,7 @@ const genericImport = async (replace, keyFormat, pem, alg, options) => {
     var _a;
     let algorithm;
     let keyUsages;
-    const keyData = new Uint8Array(globalThis
-        .atob(pem.replace(replace, ''))
+    const keyData = new Uint8Array(atob(pem.replace(replace, ''))
         .split('')
         .map((c) => c.charCodeAt(0)));
     const isPublic = keyFormat === 'spki';

package/dist/browser/runtime/base64url.js

@@ -1,5 +1,4 @@
 import { encoder, decoder } from '../lib/buffer_utils.js';
-import globalThis from './global.js';
 export const encodeBase64 = (input) => {
     let unencoded = input;
     if (typeof unencoded === 'string') {
@@ -10,14 +9,13 @@ export const encodeBase64 = (input) => {
     for (let i = 0; i < unencoded.length; i += CHUNK_SIZE) {
         arr.push(String.fromCharCode.apply(null, unencoded.subarray(i, i + CHUNK_SIZE)));
     }
-    return globalThis.btoa(arr.join(''));
+    return btoa(arr.join(''));
 };
 export const encode = (input) => {
     return encodeBase64(input).replace(/=/g, '').replace(/\+/g, '-').replace(/\//g, '_');
 };
 export const decodeBase64 = (encoded) => {
-    return new Uint8Array(globalThis
-        .atob(encoded)
+    return new Uint8Array(atob(encoded)
         .split('')
         .map((c) => c.charCodeAt(0)));
 };

package/dist/browser/runtime/check_key_length.js

@@ -1,11 +1,4 @@
 export default (alg, key) => {
-    if (alg.startsWith('HS')) {
-        const bitlen = parseInt(alg.substr(-3), 10);
-        const { length } = key.algorithm;
-        if (typeof length !== 'number' || length < bitlen) {
-            throw new TypeError(`${alg} requires symmetric keys to be ${bitlen} bits or larger`);
-        }
-    }
     if (alg.startsWith('RS') || alg.startsWith('PS')) {
         const { modulusLength } = key.algorithm;
         if (typeof modulusLength !== 'number' || modulusLength < 2048) {

package/dist/browser/runtime/env.js

@@ -0,0 +1,11 @@
+export function isCloudflareWorkers() {
+    return typeof WebSocketPair === 'function';
+}
+export function isNodeJs() {
+    try {
+        return process.versions.node !== undefined;
+    }
+    catch (_a) {
+        return false;
+    }
+}

package/dist/browser/runtime/fetch_jwks.js

@@ -1,5 +1,5 @@
 import { JOSEError, JWKSTimeout } from '../util/errors.js';
-import globalThis, { isCloudflareWorkers } from './global.js';
+import { isCloudflareWorkers } from './env.js';
 const fetchJwks = async (url, timeout) => {
     let controller;
     let id;
@@ -11,8 +11,7 @@ const fetchJwks = async (url, timeout) => {
             controller.abort();
         }, timeout);
     }
-    const response = await globalThis
-        .fetch(url.href, {
+    const response = await fetch(url.href, {
         signal: controller ? controller.signal : undefined,
         redirect: 'manual',
         method: 'GET',
@@ -23,8 +22,7 @@ const fetchJwks = async (url, timeout) => {
                 mode: 'cors',
             }
             : undefined),
-    })
-        .catch((err) => {
+    }).catch((err) => {
         if (timedOut)
             throw new JWKSTimeout();
         throw err;

package/dist/browser/runtime/generate.js

@@ -1,4 +1,4 @@
-import { isCloudflareWorkers, isNodeJs } from './global.js';
+import { isCloudflareWorkers, isNodeJs } from './env.js';
 import crypto from './webcrypto.js';
 import { JOSENotSupported } from '../util/errors.js';
 import random from './random.js';

package/dist/browser/runtime/jwk_to_key.js

@@ -1,4 +1,4 @@
-import { isCloudflareWorkers, isNodeJs } from './global.js';
+import { isCloudflareWorkers, isNodeJs } from './env.js';
 import crypto from './webcrypto.js';
 import { JOSENotSupported } from '../util/errors.js';
 import { decode as base64url } from './base64url.js';

package/dist/browser/runtime/subtle_dsa.js

@@ -1,4 +1,4 @@
-import { isCloudflareWorkers, isNodeJs } from './global.js';
+import { isCloudflareWorkers, isNodeJs } from './env.js';
 import { JOSENotSupported } from '../util/errors.js';
 export default function subtleDsa(alg, namedCurve) {
     const length = parseInt(alg.substr(-3), 10);

package/dist/browser/runtime/webcrypto.js

@@ -1,8 +1,12 @@
-import globalThis from './global.js';
-export default globalThis.crypto;
+export default crypto;
 export function isCryptoKey(key) {
-    if (typeof globalThis.CryptoKey === 'undefined') {
+    try {
+        return (key != null &&
+            typeof key.extractable === 'boolean' &&
+            typeof key.algorithm.name === 'string' &&
+            typeof key.type === 'string');
+    }
+    catch (_a) {
         return false;
     }
-    return key != null && key instanceof globalThis.CryptoKey;
 }

package/dist/node/cjs/key/import.js

@@ -65,7 +65,8 @@ function parseElement(bytes) {
     };
 }
 function spkiFromX509(buf) {
-    return (0, base64url_js_1.encodeBase64)(getElement(getElement(parseElement(buf).contents)[0].contents)[6].raw);
+    const tbsCertificate = getElement(getElement(parseElement(buf).contents)[0].contents);
+    return (0, base64url_js_1.encodeBase64)(tbsCertificate[tbsCertificate[0].raw[0] === 0xa0 ? 6 : 5].raw);
 }
 function getSPKI(x509) {
     const pem = x509.replace(/(?:-----(?:BEGIN|END) CERTIFICATE-----|\s)/g, '');

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkEncCryptoKey = exports.checkSigCryptoKey = void 0;
-const global_js_1 = require("../runtime/global.js");
+const env_js_1 = require("../runtime/env.js");
 function unusable(name, prop = 'algorithm.name') {
     return new TypeError(`CryptoKey does not support this operation, its ${prop} must be ${name}`);
 }
@@ -74,12 +74,12 @@ function checkSigCryptoKey(key, alg, ...usages) {
                 throw unusable(`SHA-${expected}`, 'algorithm.hash');
             break;
         }
-        case (0, global_js_1.isNodeJs)() && 'EdDSA': {
+        case (0, env_js_1.isNodeJs)() && 'EdDSA': {
             if (key.algorithm.name !== 'NODE-ED25519' && key.algorithm.name !== 'NODE-ED448')
                 throw unusable('NODE-ED25519 or NODE-ED448');
             break;
         }
-        case (0, global_js_1.isCloudflareWorkers)() && 'EdDSA': {
+        case (0, env_js_1.isCloudflareWorkers)() && 'EdDSA': {
             if (!isAlgorithm(key.algorithm, 'NODE-ED25519'))
                 throw unusable('NODE-ED25519');
             break;

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

@@ -36,8 +36,8 @@ async function cbcDecrypt(enc, cek, ciphertext, iv, tag, aad) {
     }
     let plaintext;
     try {
-        const cipher = (0, crypto_1.createDecipheriv)(algorithm, encKey, iv);
-        plaintext = (0, buffer_utils_js_1.concat)(cipher.update(ciphertext), cipher.final());
+        const decipher = (0, crypto_1.createDecipheriv)(algorithm, encKey, iv);
+        plaintext = (0, buffer_utils_js_1.concat)(decipher.update(ciphertext), decipher.final());
     }
     catch {
     }
@@ -53,12 +53,14 @@ async function gcmDecrypt(enc, cek, ciphertext, iv, tag, aad) {
         throw new errors_js_1.JOSENotSupported(`alg ${enc} is not supported by your javascript runtime`);
     }
     try {
-        const cipher = (0, crypto_1.createDecipheriv)(algorithm, cek, iv, { authTagLength: 16 });
-        cipher.setAuthTag(tag);
+        const decipher = (0, crypto_1.createDecipheriv)(algorithm, cek, iv, { authTagLength: 16 });
+        decipher.setAuthTag(tag);
         if (aad.byteLength) {
-            cipher.setAAD(aad, { plaintextLength: ciphertext.length });
+            decipher.setAAD(aad, { plaintextLength: ciphertext.length });
         }
-        return (0, buffer_utils_js_1.concat)(cipher.update(ciphertext), cipher.final());
+        const plaintext = decipher.update(ciphertext);
+        decipher.final();
+        return plaintext;
     }
     catch {
         throw new errors_js_1.JWEDecryptionFailed();

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

@@ -38,7 +38,8 @@ async function gcmEncrypt(enc, plaintext, cek, iv, aad) {
     if (aad.byteLength) {
         cipher.setAAD(aad, { plaintextLength: plaintext.length });
     }
-    const ciphertext = (0, buffer_utils_js_1.concat)(cipher.update(plaintext), cipher.final());
+    const ciphertext = cipher.update(plaintext);
+    cipher.final();
     const tag = cipher.getAuthTag();
     return { ciphertext, tag };
 }

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

@@ -16,10 +16,6 @@ else {
 const sign = async (alg, key, data) => {
     const keyObject = (0, get_sign_verify_key_js_1.default)(alg, key, 'sign');
     if (alg.startsWith('HS')) {
-        const bitlen = parseInt(alg.substr(-3), 10);
-        if (!keyObject.symmetricKeySize || keyObject.symmetricKeySize << 3 < bitlen) {
-            throw new TypeError(`${alg} requires symmetric keys to be ${bitlen} bits or larger`);
-        }
         const hmac = crypto.createHmac((0, hmac_digest_js_1.default)(alg), keyObject);
         hmac.update(data);
         return hmac.digest();

package/dist/node/esm/key/import.js

@@ -62,7 +62,8 @@ function parseElement(bytes) {
     };
 }
 function spkiFromX509(buf) {
-    return encodeBase64(getElement(getElement(parseElement(buf).contents)[0].contents)[6].raw);
+    const tbsCertificate = getElement(getElement(parseElement(buf).contents)[0].contents);
+    return encodeBase64(tbsCertificate[tbsCertificate[0].raw[0] === 0xa0 ? 6 : 5].raw);
 }
 function getSPKI(x509) {
     const pem = x509.replace(/(?:-----(?:BEGIN|END) CERTIFICATE-----|\s)/g, '');

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

@@ -1,4 +1,4 @@
-import { isCloudflareWorkers, isNodeJs } from '../runtime/global.js';
+import { isCloudflareWorkers, isNodeJs } from '../runtime/env.js';
 function unusable(name, prop = 'algorithm.name') {
     return new TypeError(`CryptoKey does not support this operation, its ${prop} must be ${name}`);
 }

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

@@ -34,8 +34,8 @@ async function cbcDecrypt(enc, cek, ciphertext, iv, tag, aad) {
     }
     let plaintext;
     try {
-        const cipher = createDecipheriv(algorithm, encKey, iv);
-        plaintext = concat(cipher.update(ciphertext), cipher.final());
+        const decipher = createDecipheriv(algorithm, encKey, iv);
+        plaintext = concat(decipher.update(ciphertext), decipher.final());
     }
     catch {
     }
@@ -51,12 +51,14 @@ async function gcmDecrypt(enc, cek, ciphertext, iv, tag, aad) {
         throw new JOSENotSupported(`alg ${enc} is not supported by your javascript runtime`);
     }
     try {
-        const cipher = createDecipheriv(algorithm, cek, iv, { authTagLength: 16 });
-        cipher.setAuthTag(tag);
+        const decipher = createDecipheriv(algorithm, cek, iv, { authTagLength: 16 });
+        decipher.setAuthTag(tag);
         if (aad.byteLength) {
-            cipher.setAAD(aad, { plaintextLength: ciphertext.length });
+            decipher.setAAD(aad, { plaintextLength: ciphertext.length });
         }
-        return concat(cipher.update(ciphertext), cipher.final());
+        const plaintext = decipher.update(ciphertext);
+        decipher.final();
+        return plaintext;
     }
     catch {
         throw new JWEDecryptionFailed();

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

@@ -36,7 +36,8 @@ async function gcmEncrypt(enc, plaintext, cek, iv, aad) {
     if (aad.byteLength) {
         cipher.setAAD(aad, { plaintextLength: plaintext.length });
     }
-    const ciphertext = concat(cipher.update(plaintext), cipher.final());
+    const ciphertext = cipher.update(plaintext);
+    cipher.final();
     const tag = cipher.getAuthTag();
     return { ciphertext, tag };
 }

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

@@ -14,10 +14,6 @@ else {
 const sign = async (alg, key, data) => {
     const keyObject = getSignKey(alg, key, 'sign');
     if (alg.startsWith('HS')) {
-        const bitlen = parseInt(alg.substr(-3), 10);
-        if (!keyObject.symmetricKeySize || keyObject.symmetricKeySize << 3 < bitlen) {
-            throw new TypeError(`${alg} requires symmetric keys to be ${bitlen} bits or larger`);
-        }
         const hmac = crypto.createHmac(hmacDigest(alg), keyObject);
         hmac.update(data);
         return hmac.digest();

package/package.json

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

package/dist/browser/runtime/global.js

@@ -1,27 +0,0 @@
-function getGlobal() {
-    if (typeof globalThis !== 'undefined')
-        return globalThis;
-    if (typeof self !== 'undefined')
-        return self;
-    if (typeof window !== 'undefined')
-        return window;
-    throw new Error('unable to locate global object');
-}
-export default getGlobal();
-export function isCloudflareWorkers() {
-    try {
-        return getGlobal().WebSocketPair !== undefined;
-    }
-    catch (_a) {
-        return false;
-    }
-}
-export function isNodeJs() {
-    var _a, _b;
-    try {
-        return ((_b = (_a = getGlobal().process) === null || _a === void 0 ? void 0 : _a.versions) === null || _b === void 0 ? void 0 : _b.node) !== undefined;
-    }
-    catch (_c) {
-        return false;
-    }
-}