@vizamodo/aws-sts-core 0.4.28 → 0.4.31

package/dist/sts/issue.d.ts

@@ -1,4 +1,5 @@
 import type { AwsCredentialResult } from "../types";
+export declare function resetIsolateCache(): void;
 export declare function issueAwsCredentials(input: {
     roleArn: string;
     profileArn: string;

package/dist/sts/issue.js

@@ -26,6 +26,12 @@ let signingKeyPromise = null;
 let cachedSigningKey = null;
 let cachedCertBase64 = null;
 let cachedPrivateKeyBase64 = null;
+export function resetIsolateCache() {
+    signingKeyPromise = null;
+    cachedSigningKey = null;
+    cachedCertBase64 = null;
+    cachedPrivateKeyBase64 = null;
+}
 // ---- certificate serial cache (DER walk is CPU-bound, cert rarely rotates) ----
 let cachedCertSerialDec = null;
 let cachedCertSerialSource = null;
@@ -85,59 +91,58 @@ export async function issueAwsCredentials(input) {
     const { roleArn, profileArn, trustAnchorArn, region, certBase64, privateKeyPkcs8Base64, profile, forceRefresh, } = input;
     const sessionTtl = resolveSessionTtlByProfile(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;
-    }
+    // ---- DER serial extraction (no isolate cache — avoid stale bug) ----
+    const certSerialDec = parseCertSerialDec(normalizedCert);
     const cacheKey = `${region}|${roleArn}|${profileArn}|${trustAnchorArn}|${certSerialDec}`;
     return getCachedOrFetch(cacheKey, async () => {
-        // ---- Build SigV4 request (moved inside fetcher) ----
-        const { signingKey } = await getSigningMaterial({
-            certBase64: normalizedCert,
-            privateKeyPkcs8Base64,
-        });
-        const host = `${SERVICE}.${region}.amazonaws.com`;
-        const iso = new Date().toISOString();
-        const amzDate = isoToAmzDate(iso);
-        const dateStamp = iso.slice(0, 4) + iso.slice(5, 7) + iso.slice(8, 10);
-        const body = JSON.stringify({ trustAnchorArn, profileArn, roleArn, durationSeconds: sessionTtl });
-        const payloadHash = await sha256Hex(body);
-        const baseHeaders = {
-            "content-type": "application/json",
-            "host": host,
-            "x-amz-date": amzDate,
-            "x-amz-x509": normalizedCert,
-        };
-        const { canonicalHeaders, signedHeaders } = canonicalizeHeaders(baseHeaders);
-        const credentialScope = `${dateStamp}/${region}/${SERVICE}/aws4_request`;
-        const canonicalRequest = buildCanonicalRequest({
-            method: "POST",
-            canonicalUri: PATH,
-            query: "",
-            canonicalHeaders,
-            signedHeaders,
-            payloadHash,
-        });
-        const canonicalRequestHash = await sha256Hex(canonicalRequest);
-        const stringToSign = buildStringToSign({
-            algorithm: ALGORITHM,
-            amzDate,
-            credentialScope,
-            canonicalRequestHash,
-        });
-        const signatureHex = await signStringToSign(stringToSign, signingKey);
-        const finalHeaders = new Headers({
-            "Content-Type": "application/json",
-            "X-Amz-Date": amzDate,
-            "X-Amz-X509": normalizedCert,
-            "Authorization": `${ALGORITHM} Credential=${certSerialDec}/${credentialScope}, SignedHeaders=${signedHeaders}, Signature=${signatureHex}`,
-        });
+        async function buildSignedHeaders() {
+            const { signingKey } = await getSigningMaterial({
+                certBase64: normalizedCert,
+                privateKeyPkcs8Base64,
+            });
+            const host = `${SERVICE}.${region}.amazonaws.com`;
+            const iso = new Date().toISOString();
+            const amzDate = isoToAmzDate(iso);
+            const dateStamp = iso.slice(0, 4) + iso.slice(5, 7) + iso.slice(8, 10);
+            const body = JSON.stringify({ trustAnchorArn, profileArn, roleArn, durationSeconds: sessionTtl });
+            const payloadHash = await sha256Hex(body);
+            const baseHeaders = {
+                "content-type": "application/json",
+                "host": host,
+                "x-amz-date": amzDate,
+                "x-amz-x509": normalizedCert,
+            };
+            const { canonicalHeaders, signedHeaders } = canonicalizeHeaders(baseHeaders);
+            const credentialScope = `${dateStamp}/${region}/${SERVICE}/aws4_request`;
+            const canonicalRequest = buildCanonicalRequest({
+                method: "POST",
+                canonicalUri: PATH,
+                query: "",
+                canonicalHeaders,
+                signedHeaders,
+                payloadHash,
+            });
+            const canonicalRequestHash = await sha256Hex(canonicalRequest);
+            const stringToSign = buildStringToSign({
+                algorithm: ALGORITHM,
+                amzDate,
+                credentialScope,
+                canonicalRequestHash,
+            });
+            const signatureHex = await signStringToSign(stringToSign, signingKey);
+            const headers = new Headers({
+                "Content-Type": "application/json",
+                "X-Amz-Date": amzDate,
+                "X-Amz-X509": normalizedCert,
+                "Authorization": `${ALGORITHM} Credential=${certSerialDec}/${credentialScope}, SignedHeaders=${signedHeaders}, Signature=${signatureHex}`,
+            });
+            return {
+                headers,
+                body,
+                host,
+            };
+        }
+        const { headers: finalHeaders, body, host } = await buildSignedHeaders();
         const issuedAt = Date.now();
         let res;
         try {
@@ -152,7 +157,35 @@ export async function issueAwsCredentials(input) {
             throw new InternalError("aws_unreachable");
         }
         if (!res.ok) {
-            console.warn("[aws-rejected]", { status: res.status, region, profile });
+            const status = res.status;
+            // Safe internal hard reset trigger:
+            // Only reset isolate cache on explicit forceRefresh AND first failure
+            if (forceRefresh && status === 403) {
+                console.warn("[aws-rejected][hard-reset-trigger]", { status, region });
+                resetIsolateCache();
+                const { headers: retryHeaders, body: retryBody, host: retryHost } = await buildSignedHeaders();
+                const retryRes = await fetch(`https://${retryHost}${PATH}`, {
+                    method: "POST",
+                    headers: retryHeaders,
+                    body: retryBody,
+                });
+                if (!retryRes.ok) {
+                    console.warn("[aws-rejected][after-hard-reset]", { status: retryRes.status, region });
+                    throw new InternalError("aws_rejected");
+                }
+                const retryJson = await retryRes.json();
+                const retryCreds = retryJson?.credentialSet?.[0]?.credentials;
+                if (!retryCreds?.accessKeyId || !retryCreds?.secretAccessKey || !retryCreds?.sessionToken) {
+                    throw new InternalError("aws_malformed_credentials");
+                }
+                return {
+                    accessKeyId: retryCreds.accessKeyId,
+                    secretAccessKey: retryCreds.secretAccessKey,
+                    sessionToken: retryCreds.sessionToken,
+                    expiration: retryCreds.expiration,
+                };
+            }
+            console.warn("[aws-rejected]", { status, region, profile });
             throw new InternalError("aws_rejected");
         }
         const json = await res.json();
@@ -178,7 +211,7 @@ export async function issueAwsCredentials(input) {
         return value;
     }, {
         ttlSec: 60,
-        ...(forceRefresh !== undefined ? { forceRefresh } : {})
+        forceRefresh: !!forceRefresh
     });
 }
 // ---------------------------------------------------------------------------

package/package.json

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