Changeset e29cc2e for trip-planner-front/node_modules/follow-redirects

Timestamp:

11/25/21 22:08:24 (3 years ago)

Author:

Ema <ema_spirova@…>

Branches:

master

Children:

8d391a1

Parents:

59329aa

Message:

primeNG components

Location:

trip-planner-front/node_modules/follow-redirects

Files:

• index.js (modified) (9 diffs)
• package.json (modified) (4 diffs)

trip-planner-front/node_modules/follow-redirects/index.js

@@ -19 +19 @@
 var RedirectionError = createErrorType(
   "ERR_FR_REDIRECTION_FAILURE",
-  ""
+  "Redirected request failed"
 );
 var TooManyRedirectsError = createErrorType(
@@ -170 +170 @@
   // Stops a timeout from triggering
   function clearTimer() {
+    // Clear the timeout
     if (self._timeout) {
       clearTimeout(self._timeout);
       self._timeout = null;
     }
+
+    // Clean up all attached listeners
+    self.removeListener("abort", clearTimer);
+    self.removeListener("error", clearTimer);
+    self.removeListener("response", clearTimer);
     if (callback) {
       self.removeListener("timeout", callback);
@@ -197 +203 @@
   // Clean up on events
   this.on("socket", destroyOnTimeout);
-  this.once("response", clearTimer);
-  this.once("error", clearTimer);
+  this.on("abort", clearTimer);
+  this.on("error", clearTimer);
+  this.on("response", clearTimer);
 
   return this;
@@ -362 +369 @@
 
     // Drop the Host header, as the redirect might lead to a different host
-    var previousHostName = removeMatchingHeaders(/^host$/i, this._options.headers) ||
-      url.parse(this._currentUrl).hostname;
+    var currentHostHeader = removeMatchingHeaders(/^host$/i, this._options.headers);
+
+    // If the redirect is relative, carry over the host of the last request
+    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 }));
+
+    // 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(this._currentUrl, location);
     debug("redirecting to", redirectUrl);
     this._isRedirect = true;
@@ -372 +393 @@
     Object.assign(this._options, redirectUrlParts);
 
-    // Drop the Authorization header if redirecting to another host
-    if (redirectUrlParts.hostname !== previousHostName) {
+    // Drop the Authorization header if redirecting to another domain
+    if (!(redirectUrlParts.host === currentHost || isSubdomainOf(redirectUrlParts.host, currentHost))) {
       removeMatchingHeaders(/^authorization$/i, this._options.headers);
     }
@@ -395 +416 @@
     }
     catch (cause) {
-      var error = new RedirectionError("Redirected request failed: " + cause.message);
-      error.cause = cause;
-      this.emit("error", error);
+      this.emit("error", new RedirectionError(cause));
     }
   }
@@ -507 +526 @@
   for (var header in headers) {
     if (regex.test(header)) {
-      lastValue = headers[header];
+      lastValue = headers[header].toString().trim();
       delete headers[header];
     }
@@ -515 +534 @@
 
 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();
@@ -534 +559 @@
 }
 
+function isSubdomainOf(subdomain, domain) {
+  const dot = subdomain.length - domain.length - 1;
+  return dot > 0 && subdomain[dot] === "." && subdomain.endsWith(domain);
+}
+
 // Exports
 module.exports = wrap({ http: http, https: https });

trip-planner-front/node_modules/follow-redirects/package.json

@@ -1 +1 @@
 {
-  "_args": [
-    [
-      "follow-redirects@1.14.4",
-      "C:\\Users\\DELL\\Desktop\\bachelor-thesis\\trip-planner-front"
-    ]
-  ],
-  "_development": true,
-  "_from": "follow-redirects@1.14.4",
-  "_id": "follow-redirects@1.14.4",
+  "_from": "follow-redirects@^1.0.0",
+  "_id": "follow-redirects@1.14.5",
   "_inBundle": false,
-  "_integrity": "sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g==",
+  "_integrity": "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==",
   "_location": "/follow-redirects",
   "_phantomChildren": {},
   "_requested": {
-    "type": "version",
+    "type": "range",
     "registry": true,
-    "raw": "follow-redirects@1.14.4",
+    "raw": "follow-redirects@^1.0.0",
     "name": "follow-redirects",
     "escapedName": "follow-redirects",
-    "rawSpec": "1.14.4",
+    "rawSpec": "^1.0.0",
     "saveSpec": null,
-    "fetchSpec": "1.14.4"
+    "fetchSpec": "^1.0.0"
   },
   "_requiredBy": [
     "/http-proxy"
   ],
-  "_resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.4.tgz",
-  "_spec": "1.14.4",
-  "_where": "C:\\Users\\DELL\\Desktop\\bachelor-thesis\\trip-planner-front",
+  "_resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz",
+  "_shasum": "f09a5848981d3c772b5392309778523f8d85c381",
+  "_spec": "follow-redirects@^1.0.0",
+  "_where": "C:\\Users\\DELL\\Desktop\\bachelor-thesis\\trip-planner-front\\node_modules\\http-proxy",
   "author": {
     "name": "Ruben Verborgh",
@@ -37 +31 @@
     "url": "https://github.com/follow-redirects/follow-redirects/issues"
   },
+  "bundleDependencies": false,
   "contributors": [
     {
@@ -48 +43 @@
     }
   ],
+  "deprecated": false,
   "description": "HTTP and HTTPS modules that follow redirects.",
   "devDependencies": {
@@ -96 +92 @@
     "test": "npm run lint && npm run mocha"
   },
-  "version": "1.14.4"
+  "version": "1.14.5"
 }