jose 6.0.11 → 6.0.12

package/dist/types/jwe/compact/encrypt.d.ts

@@ -46,9 +46,10 @@ export declare class CompactEncrypt {
      */
     setProtectedHeader(protectedHeader: types.CompactJWEHeaderParameters): this;
     /**
-     * Sets the JWE Key Management parameters to be used when encrypting the Content Encryption Key.
-     * You do not need to invoke this method, it is only really intended for test and vector
-     * validation purposes.
+     * Sets the JWE Key Management parameters to be used when encrypting. Use of this is method is
+     * really only needed for ECDH based algorithms when utilizing the Agreement PartyUInfo or
+     * Agreement PartyVInfo parameters. Other parameters will always be randomly generated when needed
+     * and missing.
      *
      * @param parameters JWE Key Management parameters.
      */

package/dist/types/jwe/flattened/encrypt.d.ts

@@ -21,9 +21,9 @@ export declare class FlattenedEncrypt {
     constructor(plaintext: Uint8Array);
     /**
      * Sets the JWE Key Management parameters to be used when encrypting. Use of this is method is
-     * really only needed for ECDH based algorithms when utilizing the Agreement PartyUInfo or
-     * Agreement PartyVInfo parameters. Other parameters will always be randomly generated when needed
-     * and missing.
+     * really only needed for ECDH based algorithms when utilizing the "apu" (Agreement PartyUInfo) or
+     * "apv" (Agreement PartyVInfo) parameters. Other parameters will always be randomly generated
+     * when needed and missing.
      *
      * @param parameters JWE Key Management parameters.
      */

package/dist/types/jwks/local.d.ts

@@ -17,8 +17,9 @@ import type * as types from '../types.d.ts';
  * multiple keys get matched it is possible to opt-in to iterate over the matched keys and attempt
  * verification in an iterative manner.
  *
- * Note: The function's purpose is to resolve public keys used for verifying signatures and will not
- * work for public encryption keys.
+ * > [!NOTE]\
+ * > The function's purpose is to resolve public keys used for verifying signatures and will not work
+ * > for public encryption keys.
  *
  * This function is exported (as a named export) from the main `'jose'` module entry point as well
  * as from its subpath export `'jose/jwks/local'`.

package/dist/types/jwks/remote.d.ts

@@ -8,6 +8,10 @@ import type * as types from '../types.d.ts';
  * When passed to {@link jwks/remote.createRemoteJWKSet createRemoteJWKSet} this allows the resolver
  * to make use of advanced fetch configurations, HTTP Proxies, retry on network errors, etc.
  *
+ * > [!NOTE]\
+ * > Known caveat: Expect Type-related issues when passing the inputs through to fetch-like modules,
+ * > they hardly ever get their typings inline with actual fetch, you should `@ts-expect-error` them.
+ *
  * import ky from 'ky'
  *
  * let logRequest!: (request: Request) => void
@@ -109,9 +113,10 @@ options: {
     signal: AbortSignal;
 }) => Promise<Response>;
 /**
- * DANGER ZONE - This option has security implications that must be understood, assessed for
- * applicability, and accepted before use. It is critical that the JSON Web Key Set cache only be
- * writable by your own code.
+ * > [!WARNING]\
+ * > This option has security implications that must be understood, assessed for applicability, and
+ * > accepted before use. It is critical that the JSON Web Key Set cache only be writable by your own
+ * > code.
  *
  * This option is intended for cloud computing runtimes that cannot keep an in memory cache between
  * their code's invocations. Use in runtimes where an in memory cache between requests is available
@@ -207,8 +212,9 @@ export type JWKSCacheInput = ExportedJWKSCache | Record<string, never>;
  * multiple keys get matched it is possible to opt-in to iterate over the matched keys and attempt
  * verification in an iterative manner.
  *
- * Note: The function's purpose is to resolve public keys used for verifying signatures and will not
- * work for public encryption keys.
+ * > [!NOTE]\
+ * > The function's purpose is to resolve public keys used for verifying signatures and will not work
+ * > for public encryption keys.
  *
  * This function is exported (as a named export) from the main `'jose'` module entry point as well
  * as from its subpath export `'jose/jwks/remote'`.

package/dist/types/jwt/encrypt.d.ts

@@ -35,9 +35,9 @@ export declare class EncryptJWT implements types.ProduceJWT {
     setProtectedHeader(protectedHeader: types.CompactJWEHeaderParameters): this;
     /**
      * Sets the JWE Key Management parameters to be used when encrypting. Use of this is method is
-     * really only needed for ECDH based algorithms when utilizing the Agreement PartyUInfo or
-     * Agreement PartyVInfo parameters. Other parameters will always be randomly generated when needed
-     * and missing.
+     * really only needed for ECDH based algorithms when utilizing the "apu" (Agreement PartyUInfo) or
+     * "apv" (Agreement PartyVInfo) parameters. Other parameters will always be randomly generated
+     * when needed and missing.
      *
      * @param parameters JWE Key Management parameters.
      */

package/dist/types/key/generate_key_pair.d.ts

@@ -33,8 +33,9 @@ export interface GenerateKeyPairOptions {
  * Generates a private and a public key for a given JWA algorithm identifier. This can only generate
  * asymmetric key pairs. For symmetric secrets use the `generateSecret` function.
  *
- * Note: The `privateKey` is generated with `extractable` set to `false` by default. See
- * {@link GenerateKeyPairOptions.extractable} to generate an extractable `privateKey`.
+ * > [!NOTE]\
+ * > The `privateKey` is generated with `extractable` set to `false` by default. See
+ * > {@link GenerateKeyPairOptions.extractable} to generate an extractable `privateKey`.
  *
  * This function is exported (as a named export) from the main `'jose'` module entry point as well
  * as from its subpath export `'jose/generate/keypair'`.

package/dist/types/key/generate_secret.d.ts

@@ -9,18 +9,21 @@ export interface GenerateSecretOptions {
     /**
      * The value to use as {@link !SubtleCrypto.generateKey} `extractable` argument. Default is false.
      *
-     * Note: Because A128CBC-HS256, A192CBC-HS384, and A256CBC-HS512 secrets cannot be represented as
-     * {@link !CryptoKey} this option has no effect for them.
+     * > [!NOTE]\
+     * > Because A128CBC-HS256, A192CBC-HS384, and A256CBC-HS512 secrets cannot be represented as
+     * > {@link !CryptoKey} this option has no effect for them.
      */
     extractable?: boolean;
 }
 /**
  * Generates a symmetric secret key for a given JWA algorithm identifier.
  *
- * Note: The secret key is generated with `extractable` set to `false` by default.
+ * > [!NOTE]\
+ * > The secret key is generated with `extractable` set to `false` by default.
  *
- * Note: Because A128CBC-HS256, A192CBC-HS384, and A256CBC-HS512 secrets cannot be represented as
- * {@link !CryptoKey} this method yields a {@link !Uint8Array} for them instead.
+ * > [!NOTE]\
+ * > Because A128CBC-HS256, A192CBC-HS384, and A256CBC-HS512 secrets cannot be represented as
+ * > {@link !CryptoKey} this method yields a {@link !Uint8Array} for them instead.
  *
  * This function is exported (as a named export) from the main `'jose'` module entry point as well
  * as from its subpath export `'jose/generate/secret'`.

package/dist/types/key/import.d.ts

@@ -15,9 +15,10 @@ export interface KeyImportOptions {
 /**
  * Imports a PEM-encoded SPKI string as a {@link !CryptoKey}.
  *
- * Note: The OID id-RSASSA-PSS (1.2.840.113549.1.1.10) is not supported in
- * {@link https://w3c.github.io/webcrypto/ Web Cryptography API}, use the OID rsaEncryption
- * (1.2.840.113549.1.1.1) instead for all RSA algorithms.
+ * > [!NOTE]\
+ * > The OID id-RSASSA-PSS (1.2.840.113549.1.1.10) is not supported in
+ * > {@link https://w3c.github.io/webcrypto/ Web Cryptography API}, use the OID rsaEncryption
+ * > (1.2.840.113549.1.1.1) instead for all RSA algorithms.
  *
  * This function is exported (as a named export) from the main `'jose'` module entry point as well
  * as from its subpath export `'jose/key/import'`.
@@ -30,9 +31,10 @@ export declare function importSPKI(spki: string, alg: string, options?: KeyImpor
 /**
  * Imports the SPKI from an X.509 string certificate as a {@link !CryptoKey}.
  *
- * Note: The OID id-RSASSA-PSS (1.2.840.113549.1.1.10) is not supported in
- * {@link https://w3c.github.io/webcrypto/ Web Cryptography API}, use the OID rsaEncryption
- * (1.2.840.113549.1.1.1) instead for all RSA algorithms.
+ * > [!NOTE]\
+ * > The OID id-RSASSA-PSS (1.2.840.113549.1.1.10) is not supported in
+ * > {@link https://w3c.github.io/webcrypto/ Web Cryptography API}, use the OID rsaEncryption
+ * > (1.2.840.113549.1.1.1) instead for all RSA algorithms.
  *
  * This function is exported (as a named export) from the main `'jose'` module entry point as well
  * as from its subpath export `'jose/key/import'`.
@@ -45,9 +47,10 @@ export declare function importX509(x509: string, alg: string, options?: KeyImpor
 /**
  * Imports a PEM-encoded PKCS#8 string as a {@link !CryptoKey}.
  *
- * Note: The OID id-RSASSA-PSS (1.2.840.113549.1.1.10) is not supported in
- * {@link https://w3c.github.io/webcrypto/ Web Cryptography API}, use the OID rsaEncryption
- * (1.2.840.113549.1.1.1) instead for all RSA algorithms.
+ * > [!NOTE]\
+ * > The OID id-RSASSA-PSS (1.2.840.113549.1.1.10) is not supported in
+ * > {@link https://w3c.github.io/webcrypto/ Web Cryptography API}, use the OID rsaEncryption
+ * > (1.2.840.113549.1.1.1) instead for all RSA algorithms.
  *
  * This function is exported (as a named export) from the main `'jose'` module entry point as well
  * as from its subpath export `'jose/key/import'`.
@@ -61,11 +64,13 @@ export declare function importPKCS8(pkcs8: string, alg: string, options?: KeyImp
  * Imports a JWK to a {@link !CryptoKey}. Either the JWK "alg" (Algorithm) Parameter, or the optional
  * "alg" argument, must be present for asymmetric JSON Web Key imports.
  *
- * Note: The JSON Web Key parameters "use", "key_ops", and "ext" are also used in the
- * {@link !CryptoKey} import process.
+ * > [!NOTE]\
+ * > The JSON Web Key parameters "use", "key_ops", and "ext" are also used in the {@link !CryptoKey}
+ * > import process.
  *
- * Note: Symmetric JSON Web Keys (i.e. `kty: "oct"`) yield back an {@link !Uint8Array} instead of a
- * {@link !CryptoKey}.
+ * > [!NOTE]\
+ * > Symmetric JSON Web Keys (i.e. `kty: "oct"`) yield back an {@link !Uint8Array} instead of a
+ * > {@link !CryptoKey}.
  *
  * This function is exported (as a named export) from the main `'jose'` module entry point as well
  * as from its subpath export `'jose/key/import'`.

package/dist/types/types.d.ts

@@ -522,7 +522,8 @@ export interface VerifyOptions extends CritOption {
    * A list of accepted JWS "alg" (Algorithm) Header Parameter values. By default all "alg"
    * (Algorithm) values applicable for the used key/secret are allowed.
    *
-   * Note: Unsecured JWTs (`{ "alg": "none" }`) are never accepted by this API.
+   * > [!NOTE]\
+   * > Unsecured JWTs (`{ "alg": "none" }`) are never accepted by this API.
    */
   algorithms?: string[]
 }

package/dist/webapi/jwks/remote.js

@@ -9,7 +9,7 @@ function isCloudflareWorkers() {
 let USER_AGENT;
 if (typeof navigator === 'undefined' || !navigator.userAgent?.startsWith?.('Mozilla/5.0 ')) {
     const NAME = 'jose';
-    const VERSION = 'v6.0.11';
+    const VERSION = 'v6.0.12';
     USER_AGENT = `${NAME}/${VERSION}`;
 }
 export const customFetch = Symbol();

package/dist/webapi/lib/asn1.js

@@ -30,50 +30,42 @@ export const toSPKI = (key) => {
 export const toPKCS8 = (key) => {
     return genericExport('private', 'pkcs8', key);
 };
-const findOid = (keyData, oid, from = 0) => {
-    if (from === 0) {
-        oid.unshift(oid.length);
-        oid.unshift(0x06);
-    }
-    const i = keyData.indexOf(oid[0], from);
-    if (i === -1)
-        return false;
-    const sub = keyData.subarray(i, i + oid.length);
-    if (sub.length !== oid.length)
-        return false;
-    return sub.every((value, index) => value === oid[index]) || findOid(keyData, oid, i + 1);
-};
 const getNamedCurve = (keyData) => {
-    switch (true) {
-        case findOid(keyData, [0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07]):
-            return 'P-256';
-        case findOid(keyData, [0x2b, 0x81, 0x04, 0x00, 0x22]):
-            return 'P-384';
-        case findOid(keyData, [0x2b, 0x81, 0x04, 0x00, 0x23]):
-            return 'P-521';
-        default:
-            return undefined;
+    const patterns = Object.entries({
+        'P-256': [0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07],
+        'P-384': [0x06, 0x05, 0x2b, 0x81, 0x04, 0x00, 0x22],
+        'P-521': [0x06, 0x05, 0x2b, 0x81, 0x04, 0x00, 0x23],
+    });
+    const maxPatternLen = Math.max(...patterns.map(([, bytes]) => bytes.length));
+    for (let i = 0; i <= keyData.byteLength - maxPatternLen; i++) {
+        for (const [curve, bytes] of patterns) {
+            if (i <= keyData.byteLength - bytes.length) {
+                if (keyData.subarray(i, i + bytes.length).every((byte, idx) => byte === bytes[idx])) {
+                    return curve;
+                }
+            }
+        }
     }
+    return undefined;
 };
-const genericImport = async (replace, keyFormat, pem, alg, options) => {
+const genericImport = async (keyFormat, keyData, alg, options) => {
     let algorithm;
     let keyUsages;
-    const keyData = new Uint8Array(atob(pem.replace(replace, ''))
-        .split('')
-        .map((c) => c.charCodeAt(0)));
     const isPublic = keyFormat === 'spki';
+    const getSignatureUsages = () => (isPublic ? ['verify'] : ['sign']);
+    const getEncryptionUsages = () => isPublic ? ['encrypt', 'wrapKey'] : ['decrypt', 'unwrapKey'];
     switch (alg) {
         case 'PS256':
         case 'PS384':
         case 'PS512':
             algorithm = { name: 'RSA-PSS', hash: `SHA-${alg.slice(-3)}` };
-            keyUsages = isPublic ? ['verify'] : ['sign'];
+            keyUsages = getSignatureUsages();
             break;
         case 'RS256':
         case 'RS384':
         case 'RS512':
             algorithm = { name: 'RSASSA-PKCS1-v1_5', hash: `SHA-${alg.slice(-3)}` };
-            keyUsages = isPublic ? ['verify'] : ['sign'];
+            keyUsages = getSignatureUsages();
             break;
         case 'RSA-OAEP':
         case 'RSA-OAEP-256':
@@ -83,33 +75,29 @@ const genericImport = async (replace, keyFormat, pem, alg, options) => {
                 name: 'RSA-OAEP',
                 hash: `SHA-${parseInt(alg.slice(-3), 10) || 1}`,
             };
-            keyUsages = isPublic ? ['encrypt', 'wrapKey'] : ['decrypt', 'unwrapKey'];
+            keyUsages = getEncryptionUsages();
             break;
         case 'ES256':
-            algorithm = { name: 'ECDSA', namedCurve: 'P-256' };
-            keyUsages = isPublic ? ['verify'] : ['sign'];
-            break;
         case 'ES384':
-            algorithm = { name: 'ECDSA', namedCurve: 'P-384' };
-            keyUsages = isPublic ? ['verify'] : ['sign'];
-            break;
-        case 'ES512':
-            algorithm = { name: 'ECDSA', namedCurve: 'P-521' };
-            keyUsages = isPublic ? ['verify'] : ['sign'];
+        case 'ES512': {
+            const curveMap = { ES256: 'P-256', ES384: 'P-384', ES512: 'P-521' };
+            algorithm = { name: 'ECDSA', namedCurve: curveMap[alg] };
+            keyUsages = getSignatureUsages();
             break;
+        }
         case 'ECDH-ES':
         case 'ECDH-ES+A128KW':
         case 'ECDH-ES+A192KW':
         case 'ECDH-ES+A256KW': {
             const namedCurve = getNamedCurve(keyData);
-            algorithm = namedCurve?.startsWith('P-') ? { name: 'ECDH', namedCurve } : { name: 'X25519' };
+            algorithm = namedCurve ? { name: 'ECDH', namedCurve } : { name: 'X25519' };
             keyUsages = isPublic ? [] : ['deriveBits'];
             break;
         }
         case 'Ed25519':
         case 'EdDSA':
             algorithm = { name: 'Ed25519' };
-            keyUsages = isPublic ? ['verify'] : ['sign'];
+            keyUsages = getSignatureUsages();
             break;
         default:
             throw new JOSENotSupported('Invalid or unsupported "alg" (Algorithm) value');
@@ -117,99 +105,67 @@ const genericImport = async (replace, keyFormat, pem, alg, options) => {
     return crypto.subtle.importKey(keyFormat, keyData, algorithm, options?.extractable ?? (isPublic ? true : false), keyUsages);
 };
 export const fromPKCS8 = (pem, alg, options) => {
-    return genericImport(/(?:-----(?:BEGIN|END) PRIVATE KEY-----|\s)/g, 'pkcs8', pem, alg, options);
+    const keyData = decodeBase64(pem.replace(/(?:-----(?:BEGIN|END) PRIVATE KEY-----|\s)/g, ''));
+    return genericImport('pkcs8', keyData, alg, options);
 };
 export const fromSPKI = (pem, alg, options) => {
-    return genericImport(/(?:-----(?:BEGIN|END) PUBLIC KEY-----|\s)/g, 'spki', pem, alg, options);
+    const keyData = decodeBase64(pem.replace(/(?:-----(?:BEGIN|END) PUBLIC KEY-----|\s)/g, ''));
+    return genericImport('spki', keyData, alg, options);
 };
-function getElement(seq) {
-    const result = [];
-    let next = 0;
-    while (next < seq.length) {
-        const nextPart = parseElement(seq.subarray(next));
-        result.push(nextPart);
-        next += nextPart.byteLength;
-    }
-    return result;
-}
-function parseElement(bytes) {
-    let position = 0;
-    let tag = bytes[0] & 0x1f;
-    position++;
-    if (tag === 0x1f) {
-        tag = 0;
-        while (bytes[position] >= 0x80) {
-            tag = tag * 128 + bytes[position] - 0x80;
-            position++;
-        }
-        tag = tag * 128 + bytes[position] - 0x80;
-        position++;
-    }
-    let length = 0;
-    if (bytes[position] < 0x80) {
-        length = bytes[position];
-        position++;
-    }
-    else if (length === 0x80) {
-        length = 0;
-        while (bytes[position + length] !== 0 || bytes[position + length + 1] !== 0) {
-            if (length > bytes.byteLength) {
-                throw new TypeError('invalid indefinite form length');
+function spkiFromX509(buf) {
+    let pos = 0;
+    const parseLength = () => {
+        const first = buf[pos++];
+        if (first & 0x80) {
+            const lengthOfLength = first & 0x7f;
+            let length = 0;
+            for (let i = 0; i < lengthOfLength; i++) {
+                length = (length << 8) | buf[pos++];
             }
-            length++;
+            return length;
         }
-        const byteLength = position + length + 2;
-        return {
-            byteLength,
-            contents: bytes.subarray(position, position + length),
-            raw: bytes.subarray(0, byteLength),
-        };
-    }
-    else {
-        const numberOfDigits = bytes[position] & 0x7f;
-        position++;
-        length = 0;
-        for (let i = 0; i < numberOfDigits; i++) {
-            length = length * 256 + bytes[position];
-            position++;
+        return first;
+    };
+    const skipElement = (count = 1) => {
+        if (count <= 0)
+            return;
+        pos++;
+        const length = parseLength();
+        pos += length;
+        if (count > 1) {
+            skipElement(count - 1);
         }
-    }
-    const byteLength = position + length;
-    return {
-        byteLength,
-        contents: bytes.subarray(position, byteLength),
-        raw: bytes.subarray(0, byteLength),
     };
-}
-function spkiFromX509(buf) {
-    const tbsCertificate = getElement(getElement(parseElement(buf).contents)[0].contents);
-    return encodeBase64(tbsCertificate[tbsCertificate[0].raw[0] === 0xa0 ? 6 : 5].raw);
-}
-let createPublicKey;
-function getSPKI(x509) {
-    try {
-        createPublicKey ??= globalThis.process?.getBuiltinModule?.('node:crypto')?.createPublicKey;
-    }
-    catch {
-        createPublicKey = 0;
+    if (buf[pos++] !== 0x30)
+        throw new Error('Invalid certificate structure');
+    parseLength();
+    if (buf[pos++] !== 0x30)
+        throw new Error('Invalid tbsCertificate structure');
+    parseLength();
+    if (buf[pos] === 0xa0) {
+        skipElement(6);
     }
-    if (createPublicKey) {
-        try {
-            return new createPublicKey(x509).export({ format: 'pem', type: 'spki' });
-        }
-        catch { }
+    else {
+        skipElement(5);
     }
-    const pem = x509.replace(/(?:-----(?:BEGIN|END) CERTIFICATE-----|\s)/g, '');
-    const raw = decodeBase64(pem);
-    return formatPEM(spkiFromX509(raw), 'PUBLIC KEY');
+    const spkiStart = pos;
+    if (buf[pos++] !== 0x30)
+        throw new Error('Invalid SPKI structure');
+    const spkiContentLength = parseLength();
+    return buf.subarray(spkiStart, spkiStart + spkiContentLength + (pos - spkiStart));
+}
+function extractX509SPKI(x509) {
+    const base64Content = x509.replace(/(?:-----(?:BEGIN|END) CERTIFICATE-----|\s)/g, '');
+    const derBytes = decodeBase64(base64Content);
+    return spkiFromX509(derBytes);
 }
 export const fromX509 = (pem, alg, options) => {
     let spki;
     try {
-        spki = getSPKI(pem);
+        spki = extractX509SPKI(pem);
     }
     catch (cause) {
         throw new TypeError('Failed to parse the X.509 certificate', { cause });
     }
-    return fromSPKI(spki, alg, options);
+    return genericImport('spki', spki, alg, options);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jose",
-  "version": "6.0.11",
+  "version": "6.0.12",
   "description": "JWA, JWS, JWE, JWT, JWK, JWKS for Node.js, Browser, Cloudflare Workers, Deno, Bun, and other Web-interoperable runtimes",
   "keywords": [
     "browser",