@middy/sts 5.1.0 → 5.2.1

package/index.js

@@ -1,59 +1,83 @@
-import { canPrefetch, createPrefetchClient, createClient, getCache, getInternal, processCache, modifyCache } from '@middy/util';
-import { STSClient, AssumeRoleCommand } from '@aws-sdk/client-sts';
+import {
+  canPrefetch,
+  createPrefetchClient,
+  createClient,
+  getCache,
+  getInternal,
+  processCache,
+  modifyCache,
+  catchInvalidSignatureException
+} from '@middy/util'
+import { STSClient, AssumeRoleCommand } from '@aws-sdk/client-sts'
+
 const defaults = {
-    AwsClient: STSClient,
-    awsClientOptions: {},
-    awsClientCapture: undefined,
-    fetchData: {},
-    disablePrefetch: false,
-    cacheKey: 'sts',
-    cacheKeyExpiry: {},
-    cacheExpiry: -1,
-    setToContext: false
-};
-const stsMiddleware = (opts = {})=>{
-    const options = {
-        ...defaults,
-        ...opts
-    };
-    const fetch = (request, cachedValues = {})=>{
-        const values = {};
-        for (const internalKey of Object.keys(options.fetchData)){
-            if (cachedValues[internalKey]) continue;
-            const assumeRoleOptions = options.fetchData[internalKey];
-            assumeRoleOptions.RoleSessionName ??= 'middy-sts-session-' + Math.ceil(Math.random() * 99999);
-            values[internalKey] = client.send(new AssumeRoleCommand(assumeRoleOptions)).then((resp)=>({
-                    accessKeyId: resp.Credentials.AccessKeyId,
-                    secretAccessKey: resp.Credentials.SecretAccessKey,
-                    sessionToken: resp.Credentials.SessionToken
-                })).catch((e)=>{
-                const value = getCache(options.cacheKey).value ?? {};
-                value[internalKey] = undefined;
-                modifyCache(options.cacheKey, value);
-                throw e;
-            });
-        }
-        return values;
-    };
-    let client;
-    if (canPrefetch(options)) {
-        client = createPrefetchClient(options);
-        processCache(options, fetch);
+  AwsClient: STSClient,
+  awsClientOptions: {},
+  // awsClientAssumeRole: undefined, // Not Applicable, as this is the middleware that defines the roles
+  awsClientCapture: undefined,
+  fetchData: {}, // { contextKey: {RoleArn, RoleSessionName} }
+  disablePrefetch: false,
+  cacheKey: 'sts',
+  cacheKeyExpiry: {},
+  cacheExpiry: -1,
+  setToContext: false
+}
+
+const stsMiddleware = (opts = {}) => {
+  const options = { ...defaults, ...opts }
+
+  const fetch = (request, cachedValues = {}) => {
+    const values = {}
+
+    for (const internalKey of Object.keys(options.fetchData)) {
+      if (cachedValues[internalKey]) continue
+      const assumeRoleOptions = options.fetchData[internalKey]
+      // Date cannot be used here to assign default session name, possibility of collision when > 1 role defined
+      assumeRoleOptions.RoleSessionName ??=
+        'middy-sts-session-' + Math.ceil(Math.random() * 99999)
+      const command = new AssumeRoleCommand(assumeRoleOptions)
+      values[internalKey] = client
+        .send(command)
+        .catch((e) => catchInvalidSignatureException(e, client, command))
+        .then((resp) => ({
+          accessKeyId: resp.Credentials.AccessKeyId,
+          secretAccessKey: resp.Credentials.SecretAccessKey,
+          sessionToken: resp.Credentials.SessionToken
+        }))
+        .catch((e) => {
+          const value = getCache(options.cacheKey).value ?? {}
+          value[internalKey] = undefined
+          modifyCache(options.cacheKey, value)
+          throw e
+        })
+    }
+
+    return values
+  }
+
+  let client
+  if (canPrefetch(options)) {
+    client = createPrefetchClient(options)
+    processCache(options, fetch)
+  }
+
+  const stsMiddlewareBefore = async (request) => {
+    if (!client) {
+      client = await createClient(options, request)
+    }
+
+    const { value } = processCache(options, fetch, request)
+
+    Object.assign(request.internal, value)
+
+    if (options.setToContext) {
+      const data = await getInternal(Object.keys(options.fetchData), request)
+      if (options.setToContext) Object.assign(request.context, data)
     }
-    const stsMiddlewareBefore = async (request)=>{
-        if (!client) {
-            client = await createClient(options, request);
-        }
-        const { value } = processCache(options, fetch, request);
-        Object.assign(request.internal, value);
-        if (options.setToContext) {
-            const data = await getInternal(Object.keys(options.fetchData), request);
-            if (options.setToContext) Object.assign(request.context, data);
-        }
-    };
-    return {
-        before: stsMiddlewareBefore
-    };
-};
-export default stsMiddleware;
+  }
 
+  return {
+    before: stsMiddlewareBefore
+  }
+}
+export default stsMiddleware

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@middy/sts",
-  "version": "5.1.0",
+  "version": "5.2.1",
   "description": "STS (Security Token Service) credentials middleware for the middy framework",
   "type": "module",
   "engines": {
@@ -60,13 +60,13 @@
     "url": "https://github.com/sponsors/willfarrell"
   },
   "dependencies": {
-    "@middy/util": "5.1.0"
+    "@middy/util": "5.2.1"
   },
   "devDependencies": {
     "@aws-sdk/client-sts": "^3.0.0",
-    "@middy/core": "5.1.0",
+    "@middy/core": "5.2.1",
     "@types/aws-lambda": "^8.10.101",
     "aws-xray-sdk": "^3.3.3"
   },
-  "gitHead": "bbdaf5843914921804ba085dd58117273febe6b5"
+  "gitHead": "4d55da221b9165b4b3e59a12632fd40a149a1e92"
 }