@vizamodo/aws-sts-core 0.4.9 → 0.4.10

package/dist/sts/issue.d.ts

@@ -1,5 +1,5 @@
 import type { AwsCredentialResult } from "../types";
-export declare function issueAwsCredentials(input: {
+export interface IssueAwsCredentialsInput {
     roleArn: string;
     profileArn: string;
     trustAnchorArn: string;
@@ -8,4 +8,10 @@ export declare function issueAwsCredentials(input: {
     privateKeyPkcs8Base64: string;
     profile: string;
     forceRefresh?: boolean;
-}): Promise<AwsCredentialResult>;
+}
+/**
+ * Reset isolate-level signing-material cache.
+ * ONLY for use in tests.
+ */
+export declare function resetIsolateCache(): void;
+export declare function issueAwsCredentials(input: IssueAwsCredentialsInput): Promise<AwsCredentialResult>;

package/dist/sts/issue.js

@@ -5,7 +5,7 @@ import { buildStringToSign } from "../sigv4/string-to-sign";
 import { signStringToSign } from "./signer";
 import { InternalError } from "./errors";
 import { sha256Hex } from "../crypto/sha256";
-// ---- constants ----
+// ── Constants ──────────────────────────────────────────────────────────────
 const ALGORITHM = "AWS4-X509-ECDSA-SHA256";
 const SERVICE = "rolesanywhere";
 const PATH = "/sessions";
@@ -18,82 +18,81 @@ const PROFILE_TTL = {
     BillingAccountant: 3 * 60 * 60,
 };
 const DEFAULT_TTL = 2 * 60 * 60;
-const MIN_PROFILE_TTL = 45 * 60; // 45 min — lower guard
-const MAX_PROFILE_TTL = 12 * 60 * 60; // 12 h  — upper guard
-// ---- isolate-level signing material cache ----
-// Single Promise-based slot avoids concurrent cold-start races.
+const MIN_PROFILE_TTL = 45 * 60; // 45 min
+const MAX_PROFILE_TTL = 12 * 60 * 60; // 12 h
+// ── Isolate-level signing-material cache ───────────────────────────────────
+// Single Promise slot deduplicates concurrent cold-start imports.
+// Cache vars are updated inside .then() so all concurrent awaiters see
+// consistent state and hit the fast path on the next call.
 let signingKeyPromise = null;
 let cachedSigningKey = null;
 let cachedCertBase64 = null;
 let cachedPrivateKeyBase64 = null;
-// ---- certificate serial cache (DER walk is CPU-bound, cert rarely rotates) ----
-let cachedCertSerialDec = null;
-let cachedCertSerialSource = null;
-// ---------------------------------------------------------------------------
-// Signing material
-// ---------------------------------------------------------------------------
-async function getSigningMaterial(input) {
+// ── Test utilities ─────────────────────────────────────────────────────────
+/**
+ * Reset isolate-level signing-material cache.
+ * ONLY for use in tests.
+ */
+export function resetIsolateCache() {
+    signingKeyPromise = null;
+    cachedSigningKey = null;
+    cachedCertBase64 = null;
+    cachedPrivateKeyBase64 = null;
+}
+// ── Signing material ───────────────────────────────────────────────────────
+async function getSigningMaterial(certBase64, privateKeyPkcs8Base64) {
     // Fast path: same material already imported.
     if (cachedSigningKey &&
-        cachedCertBase64 === input.certBase64 &&
-        cachedPrivateKeyBase64 === input.privateKeyPkcs8Base64) {
-        return { signingKey: cachedSigningKey, certBase64: cachedCertBase64 };
-    }
-    // Material rotated — discard the stale resolved key so we re-import.
-    if (cachedSigningKey) {
-        signingKeyPromise = null;
-        cachedSigningKey = null;
-    }
-    if (!signingKeyPromise) {
-        try {
-            const keyBuffer = base64ToBytes(input.privateKeyPkcs8Base64);
-            signingKeyPromise = crypto.subtle.importKey("pkcs8", keyBuffer, { name: "ECDSA", namedCurve: "P-256" }, false, ["sign"]);
-        }
-        catch {
-            throw new InternalError("invalid_signing_material");
-        }
-    }
-    try {
-        cachedSigningKey = await signingKeyPromise;
-        cachedCertBase64 = input.certBase64;
-        cachedPrivateKeyBase64 = input.privateKeyPkcs8Base64;
-        return { signingKey: cachedSigningKey, certBase64: cachedCertBase64 };
+        cachedCertBase64 === certBase64 &&
+        cachedPrivateKeyBase64 === privateKeyPkcs8Base64) {
+        return cachedSigningKey;
     }
-    catch {
-        signingKeyPromise = null; // allow retry on next call
+    // Material changed or first call — reset and re-import.
+    // Cache vars are updated inside .then() so concurrent callers awaiting
+    // the same promise all get the correct key and hit the fast path next call.
+    signingKeyPromise = null;
+    cachedSigningKey = null;
+    cachedCertBase64 = null;
+    cachedPrivateKeyBase64 = null;
+    signingKeyPromise = crypto.subtle
+        .importKey("pkcs8", base64ToBytes(privateKeyPkcs8Base64), { name: "ECDSA", namedCurve: "P-256" }, false, ["sign"])
+        .then((key) => {
+        cachedSigningKey = key;
+        cachedCertBase64 = certBase64;
+        cachedPrivateKeyBase64 = privateKeyPkcs8Base64;
+        return key;
+    })
+        .catch(() => {
+        signingKeyPromise = null; // allow retry
         throw new InternalError("invalid_signing_material");
-    }
+    });
+    return signingKeyPromise;
 }
-// ---------------------------------------------------------------------------
-// Profile TTL resolution
-// ---------------------------------------------------------------------------
-function resolveSessionTtlByProfile(profile) {
+// ── Session TTL ────────────────────────────────────────────────────────────
+function resolveSessionTtl(profile) {
     const ttl = PROFILE_TTL[profile] ?? DEFAULT_TTL;
     return Math.min(Math.max(ttl, MIN_PROFILE_TTL), MAX_PROFILE_TTL);
 }
-// ---------------------------------------------------------------------------
-// Main export
-// ---------------------------------------------------------------------------
+// ── Main export ────────────────────────────────────────────────────────────
 export async function issueAwsCredentials(input) {
     const { roleArn, profileArn, trustAnchorArn, region, certBase64, privateKeyPkcs8Base64, profile, forceRefresh, } = input;
-    const sessionTtl = resolveSessionTtlByProfile(profile);
+    const sessionTtl = resolveSessionTtl(profile);
     const normalizedCert = normalizeCert(certBase64);
-    // ---- DER serial extraction (with isolate-level cache) ----
-    let certSerialDec;
-    if (cachedCertSerialDec && cachedCertSerialSource === normalizedCert) {
-        certSerialDec = cachedCertSerialDec;
-    }
-    else {
-        certSerialDec = parseCertSerialDec(normalizedCert); // throws InternalError on bad DER
-        cachedCertSerialDec = certSerialDec;
-        cachedCertSerialSource = normalizedCert;
-    }
+    // Parse serial fresh every call — no isolate cache.
+    // DER walk is ~5 µs; stale isolate-cached values caused wrong-serial bugs.
+    const certSerialDec = parseCertSerialDec(normalizedCert);
     const cacheKey = `${region}|${roleArn}|${profileArn}|${trustAnchorArn}|${certSerialDec}`;
-    // ---- Build SigV4 request ----
-    const { signingKey } = await getSigningMaterial({
-        certBase64: normalizedCert,
-        privateKeyPkcs8Base64,
-    });
+    return getCachedOrFetch(cacheKey, () => fetchCredentials({
+        roleArn, profileArn, trustAnchorArn,
+        region, normalizedCert, privateKeyPkcs8Base64,
+        sessionTtl,
+    }), { ttlSec: 60, forceRefresh });
+}
+async function fetchCredentials(input) {
+    const { roleArn, profileArn, trustAnchorArn, region, normalizedCert, privateKeyPkcs8Base64, sessionTtl, } = input;
+    // Signing happens INSIDE the fetcher so it only runs on a cache miss.
+    const signingKey = await getSigningMaterial(normalizedCert, privateKeyPkcs8Base64);
+    const certSerialDec = parseCertSerialDec(normalizedCert);
     const host = `${SERVICE}.${region}.amazonaws.com`;
     const iso = new Date().toISOString();
     const amzDate = isoToAmzDate(iso);
@@ -109,19 +108,12 @@ export async function issueAwsCredentials(input) {
     const { canonicalHeaders, signedHeaders } = canonicalizeHeaders(baseHeaders);
     const credentialScope = `${dateStamp}/${region}/${SERVICE}/aws4_request`;
     const canonicalRequest = buildCanonicalRequest({
-        method: "POST",
-        canonicalUri: PATH,
-        query: "",
-        canonicalHeaders,
-        signedHeaders,
-        payloadHash,
+        method: "POST", canonicalUri: PATH, query: "",
+        canonicalHeaders, signedHeaders, payloadHash,
     });
-    const canonicalRequestHash = await sha256Hex(canonicalRequest);
     const stringToSign = buildStringToSign({
-        algorithm: ALGORITHM,
-        amzDate,
-        credentialScope,
-        canonicalRequestHash,
+        algorithm: ALGORITHM, amzDate, credentialScope,
+        canonicalRequestHash: await sha256Hex(canonicalRequest),
     });
     const signatureHex = await signStringToSign(stringToSign, signingKey);
     const finalHeaders = new Headers({
@@ -130,55 +122,55 @@ export async function issueAwsCredentials(input) {
         "X-Amz-X509": normalizedCert,
         "Authorization": `${ALGORITHM} Credential=${certSerialDec}/${credentialScope}, SignedHeaders=${signedHeaders}, Signature=${signatureHex}`,
     });
-    const issuedAt = Date.now(); // snapshot before the network round-trip
-    return getCachedOrFetch(cacheKey, async () => {
-        const res = await fetch(`https://${host}${PATH}`, {
+    let res;
+    try {
+        res = await fetch(`https://${host}${PATH}`, {
             method: "POST",
             headers: finalHeaders,
             body,
         });
-        if (!res.ok) {
-            console.warn("[aws-rejected]", { status: res.status, region, profile });
-            throw new InternalError("aws_rejected");
-        }
-        const json = await res.json();
-        const creds = json?.credentialSet?.[0]?.credentials;
-        if (!creds?.accessKeyId || !creds?.secretAccessKey || !creds?.sessionToken) {
-            console.warn("[issueAwsCredentials] malformed AWS credential response");
-            throw new InternalError("aws_malformed_credentials");
-        }
-        const value = {
-            accessKeyId: creds.accessKeyId,
-            secretAccessKey: creds.secretAccessKey,
-            sessionToken: creds.sessionToken,
-            expiration: creds.expiration,
-        };
-        // derive TTL = 1/3 lifetime
-        const expiresAtMs = Date.parse(creds.expiration);
-        const credLifetimeSec = Math.floor((expiresAtMs - issuedAt) / 1000);
-        if (Number.isFinite(expiresAtMs) && credLifetimeSec > 0) {
-            const edgeCacheTtlSec = Math.floor(credLifetimeSec / 3);
-            const edgeCacheExpiry = new Date(issuedAt + edgeCacheTtlSec * 1000).toISOString();
-            return wrapResult(value, edgeCacheExpiry);
-        }
-        return value;
-    }, {
-        ttlSec: 60,
-        ...(forceRefresh !== undefined ? { forceRefresh } : {})
-    });
+    }
+    catch (err) {
+        console.warn("[aws-unreachable]", { region, err });
+        throw new InternalError("aws_unreachable");
+    }
+    if (!res.ok) {
+        console.warn("[aws-rejected]", { status: res.status, region });
+        throw new InternalError("aws_rejected");
+    }
+    const json = await res.json();
+    const creds = json?.credentialSet?.[0]?.credentials;
+    if (!creds?.accessKeyId || !creds?.secretAccessKey || !creds?.sessionToken) {
+        console.warn("[issueAwsCredentials] malformed AWS credential response");
+        throw new InternalError("aws_malformed_credentials");
+    }
+    const value = {
+        accessKeyId: creds.accessKeyId,
+        secretAccessKey: creds.secretAccessKey,
+        sessionToken: creds.sessionToken,
+        expiration: creds.expiration,
+    };
+    // Cache for 1/3 of the credential lifetime so it's refreshed well before expiry.
+    // getCachedOrFetch will further subtract EDGE_BUFFER_SEC (5 min).
+    const receivedAt = Date.now();
+    const expiresAtMs = Date.parse(creds.expiration);
+    const credLifetimeSec = Math.floor((expiresAtMs - receivedAt) / 1000);
+    if (Number.isFinite(expiresAtMs) && credLifetimeSec > 0) {
+        const cacheTtlSec = Math.floor(credLifetimeSec / 3);
+        const cacheExpiry = new Date(receivedAt + cacheTtlSec * 1000).toISOString();
+        return wrapResult(value, cacheExpiry);
+    }
+    return value;
 }
-// ---------------------------------------------------------------------------
-// Helpers
-// ---------------------------------------------------------------------------
-/** Strip whitespace and reject PEM-wrapped input. */
+// ── Helpers ────────────────────────────────────────────────────────────────
 function normalizeCert(raw) {
-    if (raw.includes("BEGIN CERTIFICATE")) {
+    if (raw.includes("BEGIN CERTIFICATE"))
         throw new InternalError("pem_not_allowed");
-    }
     return raw.replace(/\s+/g, "");
 }
 /**
  * Minimal DER walk to extract the certificate serial number as a decimal string.
+ * No isolate-level cache — stale cached values caused wrong-serial bugs in production.
  * Throws InternalError("invalid_cert_der") on any parse failure.
  */
 function parseCertSerialDec(normalizedCertBase64) {
@@ -208,8 +200,7 @@ function parseCertSerialDec(normalizedCertBase64) {
         // Skip optional [0] EXPLICIT version field.
         if (der[offset] === 0xa0) {
             offset++;
-            const vLen = readLen();
-            offset += vLen;
+            offset += readLen();
         }
         if (der[offset++] !== 0x02)
             throw new Error("bad serial tag");
@@ -217,15 +208,11 @@ function parseCertSerialDec(normalizedCertBase64) {
         if (offset + serialLen > der.length)
             throw new Error("DER overflow");
         let serial = der.slice(offset, offset + serialLen);
-        // Strip ASN.1 sign-extension padding byte.
-        if (serial.length > 1 && serial[0] === 0x00) {
+        if (serial.length > 1 && serial[0] === 0x00)
             serial = serial.slice(1);
-        }
-        // Accumulate directly to BigInt — avoids intermediate hex string allocation.
         let serialBig = 0n;
-        for (let i = 0; i < serial.length; i++) {
+        for (let i = 0; i < serial.length; i++)
             serialBig = (serialBig << 8n) | BigInt(serial[i]);
-        }
         return serialBig.toString();
     }
     catch (e) {
@@ -233,26 +220,16 @@ function parseCertSerialDec(normalizedCertBase64) {
         throw new InternalError("invalid_cert_der");
     }
 }
-/**
- * Convert an ISO-8601 timestamp to the compact AMZ date-time format.
- * e.g. "2026-03-07T12:00:00.000Z" → "20260307T120000Z"
- */
 function isoToAmzDate(iso) {
-    return (iso.slice(0, 4) +
-        iso.slice(5, 7) +
-        iso.slice(8, 10) +
+    return (iso.slice(0, 4) + iso.slice(5, 7) + iso.slice(8, 10) +
         "T" +
-        iso.slice(11, 13) +
-        iso.slice(14, 16) +
-        iso.slice(17, 19) +
+        iso.slice(11, 13) + iso.slice(14, 16) + iso.slice(17, 19) +
         "Z");
 }
-/** Faster base64 → Uint8Array using V8's vectorized atob path. */
 function base64ToBytes(base64) {
     const binary = atob(base64);
     const bytes = new Uint8Array(binary.length);
-    for (let i = 0; i < binary.length; i++) {
+    for (let i = 0; i < binary.length; i++)
         bytes[i] = binary.charCodeAt(i);
-    }
     return bytes;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vizamodo/aws-sts-core",
-  "version": "0.4.9",
+  "version": "0.4.10",
   "description": "Pure AWS STS + SigV4 (X509 Roles Anywhere) core logic",
   "type": "module",
   "main": "dist/index.js",