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

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [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/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/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.173.0",
   "scripts": {
     "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
     "build:cjs": "tsc -p tsconfig.cjs.json",