aws-delivlib 13.5.16 → 13.5.17

package/cdk.out/{asset.6d84cdad0db1b0ef3c0db08c3e9ceb1ca56b3f8ffc4e1e1fd23f9a51b052e8fd → asset.98dba9b3d79739d40a37e0621754556a791eef3b1c96e913c6e8d5df3a379bd4}/index.js

@@ -1679,56 +1679,56 @@ var require_follow_redirects = __commonJS({
         });
       }
       var location = response.headers.location;
-      if (location && this._options.followRedirects !== false && statusCode >= 300 && statusCode < 400) {
-        abortRequest(this._currentRequest);
-        response.destroy();
-        if (++this._redirectCount > this._options.maxRedirects) {
-          this.emit("error", new TooManyRedirectsError());
-          return;
-        }
-        if ((statusCode === 301 || statusCode === 302) && this._options.method === "POST" || statusCode === 303 && !/^(?:GET|HEAD)$/.test(this._options.method)) {
-          this._options.method = "GET";
-          this._requestBodyBuffers = [];
-          removeMatchingHeaders(/^content-/i, this._options.headers);
-        }
-        var currentHostHeader = removeMatchingHeaders(/^host$/i, this._options.headers);
-        var currentUrlParts = url.parse(this._currentUrl);
-        var currentHost = currentHostHeader || currentUrlParts.host;
-        var currentUrl = /^\w+:/.test(location) ? this._currentUrl : url.format(Object.assign(currentUrlParts, { host: currentHost }));
-        var redirectUrl;
-        try {
-          redirectUrl = url.resolve(currentUrl, location);
-        } catch (cause) {
-          this.emit("error", new RedirectionError(cause));
-          return;
-        }
-        debug("redirecting to", redirectUrl);
-        this._isRedirect = true;
-        var redirectUrlParts = url.parse(redirectUrl);
-        Object.assign(this._options, redirectUrlParts);
-        if (!(redirectUrlParts.host === currentHost || isSubdomainOf(redirectUrlParts.host, currentHost))) {
-          removeMatchingHeaders(/^(?:authorization|cookie)$/i, this._options.headers);
-        }
-        if (typeof this._options.beforeRedirect === "function") {
-          var responseDetails = { headers: response.headers };
-          try {
-            this._options.beforeRedirect.call(null, this._options, responseDetails);
-          } catch (err) {
-            this.emit("error", err);
-            return;
-          }
-          this._sanitizeOptions(this._options);
-        }
-        try {
-          this._performRequest();
-        } catch (cause) {
-          this.emit("error", new RedirectionError(cause));
-        }
-      } else {
+      if (!location || this._options.followRedirects === false || statusCode < 300 || statusCode >= 400) {
         response.responseUrl = this._currentUrl;
         response.redirects = this._redirects;
         this.emit("response", response);
         this._requestBodyBuffers = [];
+        return;
+      }
+      abortRequest(this._currentRequest);
+      response.destroy();
+      if (++this._redirectCount > this._options.maxRedirects) {
+        this.emit("error", new TooManyRedirectsError());
+        return;
+      }
+      if ((statusCode === 301 || statusCode === 302) && this._options.method === "POST" || statusCode === 303 && !/^(?:GET|HEAD)$/.test(this._options.method)) {
+        this._options.method = "GET";
+        this._requestBodyBuffers = [];
+        removeMatchingHeaders(/^content-/i, this._options.headers);
+      }
+      var currentHostHeader = removeMatchingHeaders(/^host$/i, this._options.headers);
+      var currentUrlParts = url.parse(this._currentUrl);
+      var currentHost = currentHostHeader || currentUrlParts.host;
+      var currentUrl = /^\w+:/.test(location) ? this._currentUrl : url.format(Object.assign(currentUrlParts, { host: currentHost }));
+      var redirectUrl;
+      try {
+        redirectUrl = url.resolve(currentUrl, location);
+      } catch (cause) {
+        this.emit("error", new RedirectionError(cause));
+        return;
+      }
+      debug("redirecting to", redirectUrl);
+      this._isRedirect = true;
+      var redirectUrlParts = url.parse(redirectUrl);
+      Object.assign(this._options, redirectUrlParts);
+      if (redirectUrlParts.protocol !== currentUrlParts.protocol && redirectUrlParts.protocol !== "https:" || redirectUrlParts.host !== currentHost && !isSubdomain(redirectUrlParts.host, currentHost)) {
+        removeMatchingHeaders(/^(?:authorization|cookie)$/i, this._options.headers);
+      }
+      if (typeof this._options.beforeRedirect === "function") {
+        var responseDetails = { headers: response.headers };
+        try {
+          this._options.beforeRedirect.call(null, this._options, responseDetails);
+        } catch (err) {
+          this.emit("error", err);
+          return;
+        }
+        this._sanitizeOptions(this._options);
+      }
+      try {
+        this._performRequest();
+      } catch (cause) {
+        this.emit("error", new RedirectionError(cause));
       }
     };
     function wrap(protocols) {
@@ -1831,7 +1831,7 @@ var require_follow_redirects = __commonJS({
       request.on("error", noop);
       request.abort();
     }
-    function isSubdomainOf(subdomain, domain) {
+    function isSubdomain(subdomain, domain) {
       const dot = subdomain.length - domain.length - 1;
       return dot > 0 && subdomain[dot] === "." && subdomain.endsWith(domain);
     }

package/cdk.out/delivlib-test.assets.json

@@ -225,21 +225,21 @@
         }
       }
     },
-    "6d84cdad0db1b0ef3c0db08c3e9ceb1ca56b3f8ffc4e1e1fd23f9a51b052e8fd": {
+    "98dba9b3d79739d40a37e0621754556a791eef3b1c96e913c6e8d5df3a379bd4": {
       "source": {
-        "path": "asset.6d84cdad0db1b0ef3c0db08c3e9ceb1ca56b3f8ffc4e1e1fd23f9a51b052e8fd",
+        "path": "asset.98dba9b3d79739d40a37e0621754556a791eef3b1c96e913c6e8d5df3a379bd4",
         "packaging": "zip"
       },
       "destinations": {
         "712950704752-us-east-1": {
           "bucketName": "cdk-hnb659fds-assets-712950704752-us-east-1",
-          "objectKey": "6d84cdad0db1b0ef3c0db08c3e9ceb1ca56b3f8ffc4e1e1fd23f9a51b052e8fd.zip",
+          "objectKey": "98dba9b3d79739d40a37e0621754556a791eef3b1c96e913c6e8d5df3a379bd4.zip",
           "region": "us-east-1",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::712950704752:role/cdk-hnb659fds-file-publishing-role-712950704752-us-east-1"
         }
       }
     },
-    "cd95209784fee90dcf2c073a3e9064bbdd77647e26fedc020a17885c3b8b1902": {
+    "3f51b0ef2bfe7d6fc58ae98a3c98325ad21b01b8695757f9f0748ecf98d47289": {
       "source": {
         "path": "delivlib-test.template.json",
         "packaging": "file"
@@ -247,7 +247,7 @@
       "destinations": {
         "712950704752-us-east-1": {
           "bucketName": "cdk-hnb659fds-assets-712950704752-us-east-1",
-          "objectKey": "cd95209784fee90dcf2c073a3e9064bbdd77647e26fedc020a17885c3b8b1902.json",
+          "objectKey": "3f51b0ef2bfe7d6fc58ae98a3c98325ad21b01b8695757f9f0748ecf98d47289.json",
           "region": "us-east-1",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::712950704752:role/cdk-hnb659fds-file-publishing-role-712950704752-us-east-1"
         }

package/cdk.out/delivlib-test.template.json

@@ -6857,7 +6857,7 @@
       "Properties": {
         "Code": {
           "S3Bucket": "cdk-hnb659fds-assets-712950704752-us-east-1",
-          "S3Key": "6d84cdad0db1b0ef3c0db08c3e9ceb1ca56b3f8ffc4e1e1fd23f9a51b052e8fd.zip"
+          "S3Key": "98dba9b3d79739d40a37e0621754556a791eef3b1c96e913c6e8d5df3a379bd4.zip"
         },
         "Role": {
           "Fn::GetAtt": [

package/cdk.out/manifest.json

@@ -23,7 +23,7 @@
         "validateOnSynth": false,
         "assumeRoleArn": "arn:${AWS::Partition}:iam::712950704752:role/cdk-hnb659fds-deploy-role-712950704752-us-east-1",
         "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::712950704752:role/cdk-hnb659fds-cfn-exec-role-712950704752-us-east-1",
-        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-712950704752-us-east-1/cd95209784fee90dcf2c073a3e9064bbdd77647e26fedc020a17885c3b8b1902.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-712950704752-us-east-1/3f51b0ef2bfe7d6fc58ae98a3c98325ad21b01b8695757f9f0748ecf98d47289.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [

package/cdk.out/tree.json

@@ -9259,7 +9259,7 @@
                           "aws:cdk:cloudformation:props": {
                             "code": {
                               "s3Bucket": "cdk-hnb659fds-assets-712950704752-us-east-1",
-                              "s3Key": "6d84cdad0db1b0ef3c0db08c3e9ceb1ca56b3f8ffc4e1e1fd23f9a51b052e8fd.zip"
+                              "s3Key": "98dba9b3d79739d40a37e0621754556a791eef3b1c96e913c6e8d5df3a379bd4.zip"
                             },
                             "role": {
                               "Fn::GetAtt": [

package/package.json

@@ -78,7 +78,7 @@
   ],
   "main": "lib/index.js",
   "license": "Apache-2.0",
-  "version": "13.5.16",
+  "version": "13.5.17",
   "jest": {
     "testMatch": [
       "**/lib/__tests__/**/?(*.)+(spec|test).js?(x)"