follow-redirects 1.2.0 → 1.2.4

package/LICENSE

@@ -0,0 +1,19 @@
+Copyright 2017 Olivier Lalonde <olalonde@gmail.com>, James Talmage <james@talmage.io>, Ruben Verborgh
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/index.js

@@ -42,6 +42,17 @@ function RedirectableRequest(options, responseCallback) {
 		self._processResponse(response);
 	};
 
+	// Complete the URL object when necessary
+	if (!options.pathname && options.path) {
+		var searchPos = options.path.indexOf('?');
+		if (searchPos < 0) {
+			options.pathname = options.path;
+		} else {
+			options.pathname = options.path.substring(0, searchPos);
+			options.search = options.path.substring(searchPos);
+		}
+	}
+
 	// Perform the first request
 	this._performRequest();
 }
@@ -57,7 +68,7 @@ RedirectableRequest.prototype._performRequest = function () {
 	}
 
 	// Create the native request
-	var nativeProtocol = nativeProtocols[this._options.protocol];
+	var nativeProtocol = nativeProtocols[protocol];
 	var request = this._currentRequest =
 				nativeProtocol.request(this._options, this._onNativeResponse);
 	this._currentUrl = url.format(this._options);
@@ -65,6 +76,7 @@ RedirectableRequest.prototype._performRequest = function () {
 	// Set up event handlers
 	request._redirectable = this;
 	for (var event in eventHandlers) {
+		/* istanbul ignore else */
 		if (event) {
 			request.on(event, eventHandlers[event]);
 		}
@@ -72,13 +84,12 @@ RedirectableRequest.prototype._performRequest = function () {
 
 	// End a redirected request
 	// (The first request must be ended explicitly with RedirectableRequest#end)
-	if (this._currentResponse) {
-		// If no body was written to the original request, or the method was changed to GET,
-		// end the redirected request (without writing a body).
+	if (this._isRedirect) {
+		// If the request doesn't have en entity, end directly.
 		var bufferedWrites = this._bufferedWrites;
-		if (bufferedWrites.length === 0 || this._options.method === 'GET') {
+		if (bufferedWrites.length === 0) {
 			request.end();
-		// The body of the original request must be added to the redirected request.
+		// Otherwise, write the request entity and end afterwards.
 		} else {
 			var i = 0;
 			(function writeNext() {
@@ -110,16 +121,32 @@ RedirectableRequest.prototype._processResponse = function (response) {
 			return this.emit('error', new Error('Max redirects exceeded.'));
 		}
 
+		// RFC7231§6.4: Automatic redirection needs to done with
+		// care for methods not known to be safe […],
+		// since the user might not wish to redirect an unsafe request.
 		// RFC7231§6.4.7: The 307 (Temporary Redirect) status code indicates
 		// that the target resource resides temporarily under a different URI
 		// and the user agent MUST NOT change the request method
 		// if it performs an automatic redirection to that URI.
-		if (response.statusCode !== 307) {
-			// RFC7231§6.4: Automatic redirection needs to done with
-			// care for methods not known to be safe […],
-			// since the user might not wish to redirect an unsafe request.
-			if (!(this._options.method in safeMethods)) {
-				this._options.method = 'GET';
+		var header;
+		var headers = this._options.headers;
+		if (response.statusCode !== 307 && !(this._options.method in safeMethods)) {
+			this._options.method = 'GET';
+			// Drop a possible entity and headers related to it
+			this._bufferedWrites = [];
+			for (header in headers) {
+				if (/^content-/i.test(header)) {
+					delete headers[header];
+				}
+			}
+		}
+
+		// Drop the Host header, as the redirect might lead to a different host
+		if (!this._isRedirect) {
+			for (header in headers) {
+				if (/^host$/i.test(header)) {
+					delete headers[header];
+				}
 			}
 		}
 
@@ -127,7 +154,7 @@ RedirectableRequest.prototype._processResponse = function (response) {
 		var redirectUrl = url.resolve(this._currentUrl, location);
 		debug('redirecting to', redirectUrl);
 		Object.assign(this._options, url.parse(redirectUrl));
-		this._currentResponse = response;
+		this._isRedirect = true;
 		this._performRequest();
 	} else {
 		// The response is not a redirect; return it as-is
@@ -166,7 +193,7 @@ RedirectableRequest.prototype.setTimeout = function (timeout, callback) {
 };
 
 // Writes buffered data to the current native request
-RedirectableRequest.prototype._write = function (data, encoding, callback) {
+RedirectableRequest.prototype.write = function (data, encoding, callback) {
 	this._currentRequest.write(data, encoding, callback);
 	this._bufferedWrites.push({data: data, encoding: encoding});
 };

package/package.json

@@ -1,8 +1,11 @@
 {
   "name": "follow-redirects",
-  "version": "1.2.0",
+  "version": "1.2.4",
   "description": "HTTP and HTTPS modules that follow redirects.",
   "main": "index.js",
+  "engines": {
+    "node": ">=4.0"
+  },
   "scripts": {
     "test": "xo && BLUEBIRD_DEBUG=1 nyc mocha"
   },
@@ -39,16 +42,16 @@
     "https.js"
   ],
   "dependencies": {
-    "debug": "^2.2.0"
+    "debug": "^2.4.5"
   },
   "devDependencies": {
     "bluebird": "^3.4.0",
-    "concat-stream": "^1.5.0",
-    "coveralls": "^2.11.2",
+    "concat-stream": "^1.5.2",
+    "coveralls": "^2.11.15",
     "express": "^4.13.0",
-    "mocha": "^3.1.2",
-    "nyc": "^8.3.1",
-    "xo": "^0.17.0"
+    "mocha": "^3.2.0",
+    "nyc": "^10.0.0",
+    "xo": "^0.17.1"
   },
   "license": "MIT",
   "nyc": {