@aws-sdk/s3-request-presigner 3.171.0 → 3.178.0

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.178.0](https://github.com/aws/aws-sdk-js-v3/compare/v3.177.0...v3.178.0) (2022-09-23)
+
+
+### Features
+
+* **endpoint:** endpoints 2.0 existing package changes ([#3947](https://github.com/aws/aws-sdk-js-v3/issues/3947)) ([df99fc3](https://github.com/aws/aws-sdk-js-v3/commit/df99fc33a43982e1c59000721a535f6fe77a3c23))
+
+
+
+
+
+# [3.173.0](https://github.com/aws/aws-sdk-js-v3/compare/v3.172.0...v3.173.0) (2022-09-16)
+
+
+### Bug Fixes
+
+* **s3-request-presigner:** add port to host name if missed ([#3897](https://github.com/aws/aws-sdk-js-v3/issues/3897)) ([37f574f](https://github.com/aws/aws-sdk-js-v3/commit/37f574fe33546720177866ed1c34333c68066c8e))
+
+
+
+
+
 # [3.171.0](https://github.com/aws/aws-sdk-js-v3/compare/v3.170.0...v3.171.0) (2022-09-14)
 
 **Note:** Version bump only for package @aws-sdk/s3-request-presigner

package/dist-cjs/getSignedUrl.js

@@ -1,11 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSignedUrl = void 0;
+const middleware_endpoint_1 = require("@aws-sdk/middleware-endpoint");
 const protocol_http_1 = require("@aws-sdk/protocol-http");
 const util_format_url_1 = require("@aws-sdk/util-format-url");
 const presigner_1 = require("./presigner");
 const getSignedUrl = async (client, command, options = {}) => {
-    const s3Presigner = new presigner_1.S3RequestPresigner({ ...client.config });
+    var _a, _b;
+    let s3Presigner;
+    if (typeof client.config.endpointProvider === "function") {
+        const endpointV2 = await (0, middleware_endpoint_1.getEndpointFromInstructions)(command.input, command.constructor, client.config);
+        const authScheme = (_b = (_a = endpointV2.properties) === null || _a === void 0 ? void 0 : _a.authSchemes) === null || _b === void 0 ? void 0 : _b[0];
+        s3Presigner = new presigner_1.S3RequestPresigner({
+            ...client.config,
+            signingName: authScheme === null || authScheme === void 0 ? void 0 : authScheme.signingName,
+            region: async () => authScheme === null || authScheme === void 0 ? void 0 : authScheme.signingScope,
+        });
+    }
+    else {
+        s3Presigner = new presigner_1.S3RequestPresigner(client.config);
+    }
     const presignInterceptMiddleware = (next, context) => async (args) => {
         var _a, _b;
         const { request } = args;

package/dist-cjs/presigner.js

@@ -13,7 +13,7 @@ class S3RequestPresigner {
         };
         this.signer = new signature_v4_multi_region_1.SignatureV4MultiRegion(resolvedOptions);
     }
-    async presign(requestToSign, { unsignableHeaders = new Set(), unhoistableHeaders = new Set(), ...options } = {}) {
+    presign(requestToSign, { unsignableHeaders = new Set(), unhoistableHeaders = new Set(), ...options } = {}) {
         unsignableHeaders.add("content-type");
         Object.keys(requestToSign.headers)
             .map((header) => header.toLowerCase())
@@ -22,11 +22,11 @@ class S3RequestPresigner {
             unhoistableHeaders.add(header);
         });
         requestToSign.headers[constants_1.SHA256_HEADER] = constants_1.UNSIGNED_PAYLOAD;
-        if (!requestToSign.headers["host"]) {
-            requestToSign.headers.host = requestToSign.hostname;
-            if (requestToSign.port) {
-                requestToSign.headers.host = `${requestToSign.headers.host}:${requestToSign.port}`;
-            }
+        const currentHostHeader = requestToSign.headers.host;
+        const port = requestToSign.port;
+        const expectedHostHeader = `${requestToSign.hostname}${requestToSign.port != null ? ":" + port : ""}`;
+        if (!currentHostHeader || (currentHostHeader === requestToSign.hostname && requestToSign.port != null)) {
+            requestToSign.headers.host = expectedHostHeader;
         }
         return this.signer.presign(requestToSign, {
             expiresIn: 900,

package/dist-es/getSignedUrl.js

@@ -1,15 +1,29 @@
 import { __assign, __awaiter, __generator } from "tslib";
+import { getEndpointFromInstructions } from "@aws-sdk/middleware-endpoint";
 import { HttpRequest } from "@aws-sdk/protocol-http";
 import { formatUrl } from "@aws-sdk/util-format-url";
 import { S3RequestPresigner } from "./presigner";
 export var getSignedUrl = function (client, command, options) {
     if (options === void 0) { options = {}; }
     return __awaiter(void 0, void 0, void 0, function () {
-        var s3Presigner, presignInterceptMiddleware, middlewareName, clientStack, handler, output, presigned;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+        var s3Presigner, endpointV2, authScheme_1, presignInterceptMiddleware, middlewareName, clientStack, handler, output, presigned;
+        var _a, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0:
-                    s3Presigner = new S3RequestPresigner(__assign({}, client.config));
+                    if (!(typeof client.config.endpointProvider === "function")) return [3, 2];
+                    return [4, getEndpointFromInstructions(command.input, command.constructor, client.config)];
+                case 1:
+                    endpointV2 = _c.sent();
+                    authScheme_1 = (_b = (_a = endpointV2.properties) === null || _a === void 0 ? void 0 : _a.authSchemes) === null || _b === void 0 ? void 0 : _b[0];
+                    s3Presigner = new S3RequestPresigner(__assign(__assign({}, client.config), { signingName: authScheme_1 === null || authScheme_1 === void 0 ? void 0 : authScheme_1.signingName, region: function () { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
+                            return [2, authScheme_1 === null || authScheme_1 === void 0 ? void 0 : authScheme_1.signingScope];
+                        }); }); } }));
+                    return [3, 3];
+                case 2:
+                    s3Presigner = new S3RequestPresigner(client.config);
+                    _c.label = 3;
+                case 3:
                     presignInterceptMiddleware = function (next, context) { return function (args) { return __awaiter(void 0, void 0, void 0, function () {
                         var request, presigned;
                         var _a, _b;
@@ -46,8 +60,8 @@ export var getSignedUrl = function (client, command, options) {
                     });
                     handler = command.resolveMiddleware(clientStack, client.config, {});
                     return [4, handler({ input: command.input })];
-                case 1:
-                    output = (_a.sent()).output;
+                case 4:
+                    output = (_c.sent()).output;
                     presigned = output.presigned;
                     return [2, formatUrl(presigned)];
             }

package/dist-es/presigner.js

@@ -1,4 +1,4 @@
-import { __assign, __awaiter, __generator, __rest } from "tslib";
+import { __assign, __rest } from "tslib";
 import { SignatureV4MultiRegion } from "@aws-sdk/signature-v4-multi-region";
 import { SHA256_HEADER, UNSIGNED_PAYLOAD } from "./constants";
 var S3RequestPresigner = (function () {
@@ -9,25 +9,21 @@ var S3RequestPresigner = (function () {
     S3RequestPresigner.prototype.presign = function (requestToSign, _a) {
         if (_a === void 0) { _a = {}; }
         var _b = _a.unsignableHeaders, unsignableHeaders = _b === void 0 ? new Set() : _b, _c = _a.unhoistableHeaders, unhoistableHeaders = _c === void 0 ? new Set() : _c, options = __rest(_a, ["unsignableHeaders", "unhoistableHeaders"]);
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_d) {
-                unsignableHeaders.add("content-type");
-                Object.keys(requestToSign.headers)
-                    .map(function (header) { return header.toLowerCase(); })
-                    .filter(function (header) { return header.startsWith("x-amz-server-side-encryption"); })
-                    .forEach(function (header) {
-                    unhoistableHeaders.add(header);
-                });
-                requestToSign.headers[SHA256_HEADER] = UNSIGNED_PAYLOAD;
-                if (!requestToSign.headers["host"]) {
-                    requestToSign.headers.host = requestToSign.hostname;
-                    if (requestToSign.port) {
-                        requestToSign.headers.host = "".concat(requestToSign.headers.host, ":").concat(requestToSign.port);
-                    }
-                }
-                return [2, this.signer.presign(requestToSign, __assign({ expiresIn: 900, unsignableHeaders: unsignableHeaders, unhoistableHeaders: unhoistableHeaders }, options))];
-            });
+        unsignableHeaders.add("content-type");
+        Object.keys(requestToSign.headers)
+            .map(function (header) { return header.toLowerCase(); })
+            .filter(function (header) { return header.startsWith("x-amz-server-side-encryption"); })
+            .forEach(function (header) {
+            unhoistableHeaders.add(header);
         });
+        requestToSign.headers[SHA256_HEADER] = UNSIGNED_PAYLOAD;
+        var currentHostHeader = requestToSign.headers.host;
+        var port = requestToSign.port;
+        var expectedHostHeader = "".concat(requestToSign.hostname).concat(requestToSign.port != null ? ":" + port : "");
+        if (!currentHostHeader || (currentHostHeader === requestToSign.hostname && requestToSign.port != null)) {
+            requestToSign.headers.host = expectedHostHeader;
+        }
+        return this.signer.presign(requestToSign, __assign({ expiresIn: 900, unsignableHeaders: unsignableHeaders, unhoistableHeaders: unhoistableHeaders }, options));
     };
     return S3RequestPresigner;
 }());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/s3-request-presigner",
-  "version": "3.171.0",
+  "version": "3.178.0",
   "scripts": {
     "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
     "build:cjs": "tsc -p tsconfig.cjs.json",
@@ -20,18 +20,18 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-sdk/middleware-sdk-s3": "3.171.0",
-    "@aws-sdk/protocol-http": "3.171.0",
-    "@aws-sdk/signature-v4-multi-region": "3.171.0",
-    "@aws-sdk/smithy-client": "3.171.0",
-    "@aws-sdk/types": "3.171.0",
-    "@aws-sdk/util-create-request": "3.171.0",
-    "@aws-sdk/util-format-url": "3.171.0",
+    "@aws-sdk/middleware-sdk-s3": "3.178.0",
+    "@aws-sdk/protocol-http": "3.178.0",
+    "@aws-sdk/signature-v4-multi-region": "3.178.0",
+    "@aws-sdk/smithy-client": "3.178.0",
+    "@aws-sdk/types": "3.178.0",
+    "@aws-sdk/util-create-request": "3.178.0",
+    "@aws-sdk/util-format-url": "3.178.0",
     "tslib": "^2.3.1"
   },
   "devDependencies": {
-    "@aws-sdk/client-s3": "3.171.0",
-    "@aws-sdk/hash-node": "3.171.0",
+    "@aws-sdk/client-s3": "3.178.0",
+    "@aws-sdk/hash-node": "3.178.0",
     "@tsconfig/recommended": "1.0.1",
     "@types/node": "^12.0.2",
     "concurrently": "7.0.0",