@aws-sdk/middleware-signing 3.523.0 → 3.534.0

package/dist-cjs/index.js

@@ -80,14 +80,21 @@ var resolveAwsAuthConfig = /* @__PURE__ */ __name((input) => {
         },
         authScheme
       );
+      const isSigv4a = (authScheme == null ? void 0 : authScheme.name) === "sigv4a";
       const signingRegion = authScheme.signingRegion;
       const signingService = authScheme.signingName;
-      input.signingRegion = input.signingRegion || signingRegion;
+      let regionForSigner;
+      if (isSigv4a) {
+        regionForSigner = input.signingRegion || signingRegion;
+      } else {
+        input.signingRegion = input.signingRegion || signingRegion;
+        regionForSigner = input.signingRegion;
+      }
       input.signingName = input.signingName || signingService || input.serviceId;
       const params = {
         ...input,
         credentials: normalizedCreds,
-        region: input.signingRegion,
+        region: regionForSigner,
         service: input.signingName,
         sha256,
         uriEscapePath: signingEscapePath
@@ -164,13 +171,39 @@ var getUpdatedSystemClockOffset = /* @__PURE__ */ __name((clockTime, currentSyst
 
 // src/awsAuthMiddleware.ts
 var awsAuthMiddleware = /* @__PURE__ */ __name((options) => (next, context) => async function(args) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e, _f, _g;
   if (!import_protocol_http.HttpRequest.isInstance(args.request))
     return next(args);
-  const authScheme = (_c = (_b = (_a = context.endpointV2) == null ? void 0 : _a.properties) == null ? void 0 : _b.authSchemes) == null ? void 0 : _c[0];
-  const multiRegionOverride = (authScheme == null ? void 0 : authScheme.name) === "sigv4a" ? (_d = authScheme == null ? void 0 : authScheme.signingRegionSet) == null ? void 0 : _d.join(",") : void 0;
-  const signer = await options.signer(authScheme);
+  let authScheme;
+  let signer;
+  const firstAuthScheme = (_c = (_b = (_a = context.endpointV2) == null ? void 0 : _a.properties) == null ? void 0 : _b.authSchemes) == null ? void 0 : _c[0];
+  const secondAuthScheme = (_f = (_e = (_d = context.endpointV2) == null ? void 0 : _d.properties) == null ? void 0 : _e.authSchemes) == null ? void 0 : _f[1];
+  const firstAuthSchemeIsSigv4a = (firstAuthScheme == null ? void 0 : firstAuthScheme.name) === "sigv4a";
+  if (firstAuthSchemeIsSigv4a && secondAuthScheme) {
+    signer = await options.signer(authScheme = firstAuthScheme);
+    const uncheckedSigner = signer;
+    const sigv4aAvailable = (() => {
+      var _a2;
+      if (typeof (uncheckedSigner == null ? void 0 : uncheckedSigner.getSigv4aSigner) === "function") {
+        if (((_a2 = uncheckedSigner == null ? void 0 : uncheckedSigner.signerOptions) == null ? void 0 : _a2.runtime) !== "node") {
+          return false;
+        }
+        try {
+          uncheckedSigner.getSigv4aSigner();
+          return true;
+        } catch (e) {
+        }
+      }
+      return false;
+    })();
+    if (!sigv4aAvailable) {
+      signer = await options.signer(authScheme = secondAuthScheme);
+    }
+  } else {
+    signer = await options.signer(authScheme = firstAuthScheme);
+  }
   let signedRequest;
+  const multiRegionOverride = (authScheme == null ? void 0 : authScheme.name) === "sigv4a" ? (_g = authScheme == null ? void 0 : authScheme.signingRegionSet) == null ? void 0 : _g.join(",") : void 0;
   const signingOptions = {
     signingDate: getSkewCorrectedDate(options.systemClockOffset),
     signingRegion: multiRegionOverride || context["signing_region"],

package/dist-es/awsAuthConfiguration.js

@@ -46,14 +46,22 @@ export const resolveAwsAuthConfig = (input) => {
                 signingRegion: await normalizeProvider(input.region)(),
                 properties: {},
             }, authScheme);
+            const isSigv4a = authScheme?.name === "sigv4a";
             const signingRegion = authScheme.signingRegion;
             const signingService = authScheme.signingName;
-            input.signingRegion = input.signingRegion || signingRegion;
+            let regionForSigner;
+            if (isSigv4a) {
+                regionForSigner = input.signingRegion || signingRegion;
+            }
+            else {
+                input.signingRegion = input.signingRegion || signingRegion;
+                regionForSigner = input.signingRegion;
+            }
             input.signingName = input.signingName || signingService || input.serviceId;
             const params = {
                 ...input,
                 credentials: normalizedCreds,
-                region: input.signingRegion,
+                region: regionForSigner,
                 service: input.signingName,
                 sha256,
                 uriEscapePath: signingEscapePath,

package/dist-es/awsAuthMiddleware.js

@@ -4,10 +4,36 @@ import { getUpdatedSystemClockOffset } from "./utils/getUpdatedSystemClockOffset
 export const awsAuthMiddleware = (options) => (next, context) => async function (args) {
     if (!HttpRequest.isInstance(args.request))
         return next(args);
-    const authScheme = context.endpointV2?.properties?.authSchemes?.[0];
-    const multiRegionOverride = authScheme?.name === "sigv4a" ? authScheme?.signingRegionSet?.join(",") : undefined;
-    const signer = await options.signer(authScheme);
+    let authScheme;
+    let signer;
+    const firstAuthScheme = context.endpointV2?.properties?.authSchemes?.[0];
+    const secondAuthScheme = context.endpointV2?.properties?.authSchemes?.[1];
+    const firstAuthSchemeIsSigv4a = firstAuthScheme?.name === "sigv4a";
+    if (firstAuthSchemeIsSigv4a && secondAuthScheme) {
+        signer = await options.signer((authScheme = firstAuthScheme));
+        const uncheckedSigner = signer;
+        const sigv4aAvailable = (() => {
+            if (typeof uncheckedSigner?.getSigv4aSigner === "function") {
+                if (uncheckedSigner?.signerOptions?.runtime !== "node") {
+                    return false;
+                }
+                try {
+                    uncheckedSigner.getSigv4aSigner();
+                    return true;
+                }
+                catch (e) { }
+            }
+            return false;
+        })();
+        if (!sigv4aAvailable) {
+            signer = await options.signer((authScheme = secondAuthScheme));
+        }
+    }
+    else {
+        signer = await options.signer((authScheme = firstAuthScheme));
+    }
     let signedRequest;
+    const multiRegionOverride = authScheme?.name === "sigv4a" ? authScheme?.signingRegionSet?.join(",") : undefined;
     const signingOptions = {
         signingDate: getSkewCorrectedDate(options.systemClockOffset),
         signingRegion: multiRegionOverride || context["signing_region"],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/middleware-signing",
-  "version": "3.523.0",
+  "version": "3.534.0",
   "scripts": {
     "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
     "build:cjs": "node ../../scripts/compilation/inline middleware-signing",
@@ -22,12 +22,12 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-sdk/types": "3.523.0",
-    "@smithy/property-provider": "^2.1.3",
-    "@smithy/protocol-http": "^3.2.1",
-    "@smithy/signature-v4": "^2.1.3",
-    "@smithy/types": "^2.10.1",
-    "@smithy/util-middleware": "^2.1.3",
+    "@aws-sdk/types": "3.533.0",
+    "@smithy/property-provider": "^2.1.4",
+    "@smithy/protocol-http": "^3.2.2",
+    "@smithy/signature-v4": "^2.1.4",
+    "@smithy/types": "^2.11.0",
+    "@smithy/util-middleware": "^2.1.4",
     "tslib": "^2.5.0"
   },
   "engines": {