Make compatible with Node 17.

Author: RubenVerborgh

.github/workflows/ci.yml

@@ -34,14 +34,14 @@ jobs:
           - '15.x'
           - '16.0'
           - '16.x'
+          - '17.0'
+          - '17.x'
     steps:
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v2
         with:
           node-version: ${{ matrix.node-version }}
       - uses: actions/checkout@v2
-      - if: ${{ matrix.node-version == '4.x' || matrix.node-version == '6.0' }}
-        run: npm install mocha@5.0.0 eslint@4.19.1 esquery@1.0.0 nyc@11.8.0
       - run: npm install
       - if: ${{ matrix.node-version == '4.x' }}
         run: npm install mocha@5.0.0 eslint@4.19.1 esquery@1.0.0 nyc@11.8.0

index.js

@@ -18,7 +18,7 @@ events.forEach(function (event) {
 // Error types with codes
 var RedirectionError = createErrorType(
   "ERR_FR_REDIRECTION_FAILURE",
-  ""
+  "Redirected request failed"
 );
 var TooManyRedirectsError = createErrorType(
   "ERR_FR_TOO_MANY_REDIRECTS",
@@ -376,8 +376,17 @@ RedirectableRequest.prototype._processResponse = function (response) {
     var currentUrl = /^\w+:/.test(location) ? this._currentUrl :
       url.format(Object.assign(currentUrlParts, { host: currentHost }));
 
+    // Determine the URL of the redirection
+    var redirectUrl;
+    try {
+      redirectUrl = url.resolve(currentUrl, location);
+    }
+    catch (cause) {
+      this.emit("error", new RedirectionError(cause));
+      return;
+    }
+
     // Create the redirected request
-    var redirectUrl = url.resolve(currentUrl, location);
     debug("redirecting to", redirectUrl);
     this._isRedirect = true;
     var redirectUrlParts = url.parse(redirectUrl);
@@ -406,9 +415,7 @@ RedirectableRequest.prototype._processResponse = function (response) {
       this._performRequest();
     }
     catch (cause) {
-      var error = new RedirectionError("Redirected request failed: " + cause.message);
-      error.cause = cause;
-      this.emit("error", error);
+      this.emit("error", new RedirectionError(cause));
     }
   }
   else {
@@ -526,9 +533,15 @@ function removeMatchingHeaders(regex, headers) {
 }
 
 function createErrorType(code, defaultMessage) {
-  function CustomError(message) {
+  function CustomError(cause) {
     Error.captureStackTrace(this, this.constructor);
-    this.message = message || defaultMessage;
+    if (!cause) {
+      this.message = defaultMessage;
+    }
+    else {
+      this.message = defaultMessage + ": " + cause.message;
+      this.cause = cause;
+    }
   }
   CustomError.prototype = new Error();
   CustomError.prototype.constructor = CustomError;

test/assets/TestCA.crt

@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE-----
+MIICmDCCAYACCQDo0UEmHVSlqjANBgkqhkiG9w0BAQsFADANMQswCQYDVQQGEwJC
+RTAgFw0yMTEwMzAxODEwMDZaGA8yMTIxMTAwNjE4MTAwNlowDTELMAkGA1UEBhMC
+QkUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYjGqoyk9fKI/Hrl8R
+4E/7A3YzvsSnDhxyOT+k7YRTpuHwL7HF/9C5EFbGPgh0c8VsQxEzbPlAwPgajeHR
+K6zFpqbkA7wozktV/vIm8DZdc5h2flUpjScazAP/MXMp7i0CpR4qmsRl9HuhFmmd
+D9VxwWjgT4rafrOXhX8HjQ015FvjpFlFAzEiRAuxJzS0zd9OmDOyR4/VxBCHyf9D
+Wz4yfZdjaXXfbc5ljJiBGS4vR0inx2hPwcxD8YWHI+o9lSCjsr1OFy0bpjJ/aXih
+Na4pe19Np0IoI+s+mlx568+WqYXbFNovH71gUhhaUtZPWByzPaeHdK5SeylZArHl
+lkKPAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAIIUHDzunkvnZ5DBMOKbEVn0fr2R
+yvKVNtRp59OWF1nJH9pr318TSk+yIClBRIismMHM6GnFYpDjqiGfJYtSN/amupGK
+h9b6aMDKKfSr7iAi9DzgPEvYaWcXGMRWmOWqxGS9zsvmM1vGkL7KsCWGIbtstxg+
+P8m4HSO6zXuBpe68yRSnNgrusMr1jviDE+aiyZANiZm7TPfIr7NHHmTk82aZtYCH
+yuDujnE5cNhJHH9iBGOBm51TZDMg9lFm9ItEAfHTC5++KfXMYokg7fqCJFU6d2y8
+O2P7e16PvX6lWcwTENq9ENiyEuTch3r+ZemJpoudKeaBcdrvLHSm+Nkvgwg=
+-----END CERTIFICATE-----

test/assets/TestCA.pem

@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDDDCCAfSgAwIBAgIJALzCVuuVEADhMA0GCSqGSIb3DQEBCwUAMA0xCzAJBgNV
+BAYTAkJFMCAXDTIxMTAzMDE4MTExNVoYDzIxMjExMDA2MTgxMTE1WjAhMQswCQYD
+VQQGEwJCRTESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAroS25VMhjk1IvVv3gvB4ZMPhwRpeDP/gfdd2mWaqPS9m/S36
+9DXGXKBiuNN0GNR8Ng1voaowFPRpvJAR6JBAhpdJsV+rLONg2jqUR49ihDZwpl77
+bvYG91DXcWGRAPLjEIHZQFtvZjQxTRGo3c614GyLzO4bz1Cac0TLtSwmlgOzWcg7
+g45+uvZOT7bJ7/7ryjUGassKiwE39RIRlFrE6DBj8TPTBmBSA6fzA2mlDX1YQzEz
+cZw7aM7IyTKEKM5C5Cc2H3ykd+fejPi/zM4ntrAOyeDXOwfskU5eXg8p/tL8USBn
+pDA94i1CNXBI+FDLwD2NZMVTb3J9vzghaN/5XwIDAQABo1kwVzAnBgNVHSMEIDAe
+oRGkDzANMQswCQYDVQQGEwJCRYIJAOjRQSYdVKWqMAkGA1UdEwQCMAAwCwYDVR0P
+BAQDAgTwMBQGA1UdEQQNMAuCCWxvY2FsaG9zdDANBgkqhkiG9w0BAQsFAAOCAQEA
+PvKbSVKzOBxl5MRczuo/QULzFLu6Rwe7dxVbTH4mOvcf2Njd5rL6oKZNAbPp5TBa
+HSXXIVJsB0cKVBMtovu+Q343AeMxPHclCOTXnKfTG3OplLuhtkzsjDMrjzynLnUK
+8iLdBT44Sa4BEPJwguZMb3fvhUKtbCj3WhoIodOgyD3W+Ufyvn5C9be6G9feBWrJ
+52O1HPp72oi54gng0VhqzUXhN6FfFSwFygxf22C1m1grl4CBdfYb6DV17JqINtk8
+HK0QOiWXlmUaGHOEYz8FZPOliUPpJWeD0N/tCAbkAYbMPvog93E1yNJjW4SYAh7z
+kVhFAcus9F4V9K47vx4a5w==
+-----END CERTIFICATE-----

test/assets/TestClient.crt

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEAroS25VMhjk1IvVv3gvB4ZMPhwRpeDP/gfdd2mWaqPS9m/S36
+9DXGXKBiuNN0GNR8Ng1voaowFPRpvJAR6JBAhpdJsV+rLONg2jqUR49ihDZwpl77
+bvYG91DXcWGRAPLjEIHZQFtvZjQxTRGo3c614GyLzO4bz1Cac0TLtSwmlgOzWcg7
+g45+uvZOT7bJ7/7ryjUGassKiwE39RIRlFrE6DBj8TPTBmBSA6fzA2mlDX1YQzEz
+cZw7aM7IyTKEKM5C5Cc2H3ykd+fejPi/zM4ntrAOyeDXOwfskU5eXg8p/tL8USBn
+pDA94i1CNXBI+FDLwD2NZMVTb3J9vzghaN/5XwIDAQABAoIBAET0rWupUD3w7Yfc
+mczEBV4TQ9VP/M94HxS6GON9/FAWtcPd8iWiRdF9keRjsKDK/JVC89PV8g+lj03x
+QxI4RTao+nY6TeF7ql4v/TzVO+Dvvc0PBJwQXCpGaAoluey9C9kO5W+XcUnZ340L
+KEUUEyss2IRNpPFicNSQ30ijvE9TWeJ6gdWSqcpGSBhjoFa1Kd/9Aqc06VNSFwLx
+i4PSuU4YIgl1qlpUC7zN7bkQ3oqhoRpzzYL1p4MAmZ5c0bNAk0/LkIVaJedEbr+j
+dx8ABqY3LyAznd7IH72UMrN999r1jC0Th3+im6G92U6Ukbotj3AY9iIyqw/xkOUa
+SwTqLAECgYEA2fCnfVJFSAc5CwxDF9FCVLLgqHb6EiJZBDLOSSXVe6crajujZXlx
+frawn3SNFR6AqNFHualCkOkrl7anucdG0733DjACqcl0LhNd4C1amxaGWUoYmGDw
+ousY/ekwtEbJWmY/nAzAn3qOIuXSV+QVndGPjOshF5DeP+Y/DpfcX18CgYEAzP7U
+M6sCI5pSTTZOY273laVxbPyrK6z8SjW1emrC9tDWeFMDRr9qy9GAj0ov4EhbAtLG
+2Frt89jHdSNxaZDe6Rcc8biVFZZWITwkH9QNwX52grNezMXD50GMjzDqVF+2H5pZ
+Wa65/71ZUPRjsyUu1ePrcQlWcA/YVqet2WBUpgECgYB9LTZmSry0VEG1UMOwiGa6
+00sqN7wGcmgCe1P0u6BUt32+NKby/7/qcfAchgsKmEx5qkqyHr+3D9YT+7t2fzj1
+IWUnZvgAoU7zr/f5bNNfxJ5B5scdroBIcxQVsrxgr0+zdosOjFyOvQuqi6o3BTBN
+RzJWVC7bpD+jIBITxbGzrQKBgD4sh+XH1xU/R/j9IJdN36+2hwlcNPpBNB+53Hnt
+iYZcXsANxW+evOBmgUx0XsLyjw/zJ7YVFhigRhaEEnDHLKSbiv7RUf5DI4pe+EHj
+Ce0G0yDfEEChNsKcAeqoFlpS0SUSpkjqEqW7IyzHgrmh7GuY/h7Bi0Lfu2jE4JiO
+e/4BAoGARW4XbEHT2eNd27inCiN4NBeFQbp8UqdPGeL9vTOl5RHCouATx5QjIhtK
+7Bb9byt2BOSvxNOJbh7kk1NThd/y1Y7GARR/61s7czx8Ass3bxJ6+rl20PhozMZb
+BWA6BwWl0DfanuHbgz+jIfU60K5tMHX0dA1tyRi2iee91e2ugyk=
+-----END RSA PRIVATE KEY-----

test/assets/TestClient.pem

@@ -29,11 +29,11 @@ describe("follow-redirects", function () {
     return {
       app: app,
       protocol: "https",
-      cert: fs.readFileSync(path.resolve(__dirname, "assets/TestServer.crt")),
-      key: fs.readFileSync(path.resolve(__dirname, "assets/TestServer.pem")),
+      cert: fs.readFileSync(path.resolve(__dirname, "assets/localhost.crt")),
+      key: fs.readFileSync(path.resolve(__dirname, "assets/localhost.key")),
     };
   }
-  var ca = fs.readFileSync(path.resolve(__dirname, "assets/TestCA.crt"));
+  var ca = fs.readFileSync(path.resolve(__dirname, "assets/ca.crt"));
 
   var app;
   var app2;
@@ -281,9 +281,36 @@ describe("follow-redirects", function () {
       .then(function (error) {
         assert(error instanceof Error);
         assert.equal(error.code, "ERR_FR_REDIRECTION_FAILURE");
-        assert.equal(error.message, "Redirected request failed: Request path contains unescaped characters");
         assert(error.cause instanceof Error);
-        assert.equal(error.cause.code, "ERR_UNESCAPED_CHARACTERS");
+        switch (error.cause.code) {
+        // Node 17+
+        case "ERR_INVALID_URL":
+          assert.equal(error.message, "Redirected request failed: Invalid URL");
+          break;
+        // Older Node versions
+        case "ERR_UNESCAPED_CHARACTERS":
+          assert.equal(error.message, "Redirected request failed: Request path contains unescaped characters");
+          break;
+        default:
+          throw new Error("Unexpected error code " + error.code);
+        }
+      });
+  });
+
+  it("emits an error whem url.resolve fails", function () {
+    app.get("/a", redirectsTo("/b"));
+    var urlResolve = url.resolve;
+    url.resolve = function () {
+      throw new Error();
+    };
+
+    return server.start(app)
+      .then(asPromise(function (resolve) {
+        http.get("http://localhost:3600/a").on("error", resolve);
+      }))
+      .then(function (error) {
+        url.resolve = urlResolve;
+        assert.equal(error.code, "ERR_FR_REDIRECTION_FAILURE");
       });
   });