Revert "Changements dans les modules (nouvelle version Express, mysql, ..)"

This reverts commit bdab795506.
2023-11-23 16:13:50 +01:00
parent 756f928ced
commit 5b0d68d66f
818 changed files with 35968 additions and 82263 deletions
--- a/node_modules/proxy-addr/HISTORY.md
+++ b/node_modules/proxy-addr/HISTORY.md
@@ -1,3 +1,84 @@
+2.0.7 / 2021-05-31
+==================
+
+  * deps: forwarded@0.2.0
+    - Use `req.socket` over deprecated `req.connection`
+
+2.0.6 / 2020-02-24
+==================
+
+  * deps: ipaddr.js@1.9.1
+
+2.0.5 / 2019-04-16
+==================
+
+  * deps: ipaddr.js@1.9.0
+
+2.0.4 / 2018-07-26
+==================
+
+  * deps: ipaddr.js@1.8.0
+
+2.0.3 / 2018-02-19
+==================
+
+  * deps: ipaddr.js@1.6.0
+
+2.0.2 / 2017-09-24
+==================
+
+  * deps: forwarded@~0.1.2
+    - perf: improve header parsing
+    - perf: reduce overhead when no `X-Forwarded-For` header
+
+2.0.1 / 2017-09-10
+==================
+
+  * deps: forwarded@~0.1.1
+    - Fix trimming leading / trailing OWS
+    - perf: hoist regular expression
+  * deps: ipaddr.js@1.5.2
+
+2.0.0 / 2017-08-08
+==================
+
+  * Drop support for Node.js below 0.10
+
+1.1.5 / 2017-07-25
+==================
+
+  * Fix array argument being altered
+  * deps: ipaddr.js@1.4.0
+
+1.1.4 / 2017-03-24
+==================
+
+  * deps: ipaddr.js@1.3.0
+
+1.1.3 / 2017-01-14
+==================
+
+  * deps: ipaddr.js@1.2.0
+
+1.1.2 / 2016-05-29
+==================
+
+  * deps: ipaddr.js@1.1.1
+    - Fix IPv6-mapped IPv4 validation edge cases
+
+1.1.1 / 2016-05-03
+==================
+
+  * Fix regression matching mixed versions against multiple subnets
+
+1.1.0 / 2016-05-01
+==================
+
+  * Fix accepting various invalid netmasks
+    - IPv4 netmasks must be contingous
+    - IPv6 addresses cannot be used as a netmask
+  * deps: ipaddr.js@1.1.0
+
 1.0.10 / 2015-12-09
 ===================

--- a/node_modules/proxy-addr/LICENSE
+++ b/node_modules/proxy-addr/LICENSE
@@ -1,6 +1,6 @@
 (The MIT License)

-Copyright (c) 2014 Douglas Christopher Wilson
+Copyright (c) 2014-2016 Douglas Christopher Wilson

 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
--- a/node_modules/proxy-addr/README.md
+++ b/node_modules/proxy-addr/README.md
@@ -1,15 +1,19 @@
 # proxy-addr

-[![NPM Version][npm-image]][npm-url]
-[![NPM Downloads][downloads-image]][downloads-url]
-[![Node.js Version][node-version-image]][node-version-url]
-[![Build Status][travis-image]][travis-url]
+[![NPM Version][npm-version-image]][npm-url]
+[![NPM Downloads][npm-downloads-image]][npm-url]
+[![Node.js Version][node-image]][node-url]
+[![Build Status][ci-image]][ci-url]
 [![Test Coverage][coveralls-image]][coveralls-url]

 Determine address of proxied request

 ## Install

+This is a [Node.js](https://nodejs.org/en/) module available through the
+[npm registry](https://www.npmjs.com/). Installation is done using the
+[`npm install` command](https://docs.npmjs.com/getting-started/installing-npm-packages-locally):
+
 ```sh
 $ npm install proxy-addr
 ```
@@ -29,8 +33,8 @@ the address, `false` if you don't. The closest untrusted address is
 returned.

 ```js
-proxyaddr(req, function(addr){ return addr === '127.0.0.1' })
-proxyaddr(req, function(addr, i){ return i < 1 })
+proxyaddr(req, function (addr) { return addr === '127.0.0.1' })
+proxyaddr(req, function (addr, i) { return i < 1 })
 ```

 The `trust` arugment may also be a single IP address string or an
@@ -49,7 +53,6 @@ automatically (i.e. `fe80::00ed:1` equals `fe80:0:0:0:0:0:ed:1`).
 ```js
 proxyaddr(req, '::1')
 proxyaddr(req, ['::1/128', 'fe80::/10'])
-proxyaddr(req, ['fe80::/ffc0::'])
 ```

 This module will automatically work with IPv4-mapped IPv6 addresses
@@ -101,8 +104,8 @@ the same arguments as `trust` does in `proxyaddr(req, trust)` and
 returns a function suitable for `proxyaddr(req, trust)`.

 ```js
-var trust = proxyaddr.compile('localhost')
-var addr  = proxyaddr(req, trust)
+var trust = proxyaddr.compile('loopback')
+var addr = proxyaddr(req, trust)
 ```

 This function is meant to be optimized for use against every request.
@@ -125,13 +128,12 @@ $ npm run-script bench

 [MIT](LICENSE)

-[npm-image]: https://img.shields.io/npm/v/proxy-addr.svg
-[npm-url]: https://npmjs.org/package/proxy-addr
-[node-version-image]: https://img.shields.io/node/v/proxy-addr.svg
-[node-version-url]: http://nodejs.org/download/
-[travis-image]: https://img.shields.io/travis/jshttp/proxy-addr/master.svg
-[travis-url]: https://travis-ci.org/jshttp/proxy-addr
-[coveralls-image]: https://img.shields.io/coveralls/jshttp/proxy-addr/master.svg
+[ci-image]: https://badgen.net/github/checks/jshttp/proxy-addr/master?label=ci
+[ci-url]: https://github.com/jshttp/proxy-addr/actions?query=workflow%3Aci
+[coveralls-image]: https://badgen.net/coveralls/c/github/jshttp/proxy-addr/master
 [coveralls-url]: https://coveralls.io/r/jshttp/proxy-addr?branch=master
-[downloads-image]: https://img.shields.io/npm/dm/proxy-addr.svg
-[downloads-url]: https://npmjs.org/package/proxy-addr
+[node-image]: https://badgen.net/npm/node/proxy-addr
+[node-url]: https://nodejs.org/en/download
+[npm-downloads-image]: https://badgen.net/npm/dm/proxy-addr
+[npm-url]: https://npmjs.org/package/proxy-addr
+[npm-version-image]: https://badgen.net/npm/v/proxy-addr
--- a/node_modules/proxy-addr/index.js
+++ b/node_modules/proxy-addr/index.js
@@ -1,6 +1,6 @@
 /*!
 * proxy-addr
- * Copyright(c) 2014 Douglas Christopher Wilson
+ * Copyright(c) 2014-2016 Douglas Christopher Wilson
 * MIT Licensed
 */

@@ -8,36 +8,40 @@

 /**
 * Module exports.
+ * @public
 */

-module.exports = proxyaddr;
-module.exports.all = alladdrs;
-module.exports.compile = compile;
+module.exports = proxyaddr
+module.exports.all = alladdrs
+module.exports.compile = compile

 /**
 * Module dependencies.
+ * @private
 */

-var forwarded = require('forwarded');
-var ipaddr = require('ipaddr.js');
+var forwarded = require('forwarded')
+var ipaddr = require('ipaddr.js')

 /**
 * Variables.
+ * @private
 */

-var digitre = /^[0-9]+$/;
-var isip = ipaddr.isValid;
-var parseip = ipaddr.parse;
+var DIGIT_REGEXP = /^[0-9]+$/
+var isip = ipaddr.isValid
+var parseip = ipaddr.parse

 /**
 * Pre-defined IP ranges.
+ * @private
 */

-var ipranges = {
+var IP_RANGES = {
  linklocal: ['169.254.0.0/16', 'fe80::/10'],
  loopback: ['127.0.0.1/8', '::1/128'],
  uniquelocal: ['10.0.0.0/8', '172.16.0.0/12', '192.168.0.0/16', 'fc00::/7']
-};
+}

 /**
 * Get all addresses in the request, optionally stopping
@@ -45,201 +49,166 @@ var ipranges = {
 *
 * @param {Object} request
 * @param {Function|Array|String} [trust]
- * @api public
+ * @public
 */

-function alladdrs(req, trust) {
+function alladdrs (req, trust) {
  // get addresses
-  var addrs = forwarded(req);
+  var addrs = forwarded(req)

  if (!trust) {
    // Return all addresses
-    return addrs;
+    return addrs
  }

  if (typeof trust !== 'function') {
-    trust = compile(trust);
+    trust = compile(trust)
  }

  for (var i = 0; i < addrs.length - 1; i++) {
-    if (trust(addrs[i], i)) continue;
+    if (trust(addrs[i], i)) continue

-    addrs.length = i + 1;
+    addrs.length = i + 1
  }

-  return addrs;
+  return addrs
 }

 /**
 * Compile argument into trust function.
 *
 * @param {Array|String} val
- * @api private
+ * @private
 */

-function compile(val) {
+function compile (val) {
  if (!val) {
-    throw new TypeError('argument is required');
+    throw new TypeError('argument is required')
  }

-  var trust = typeof val === 'string'
-    ? [val]
-    : val;
+  var trust

-  if (!Array.isArray(trust)) {
-    throw new TypeError('unsupported trust argument');
+  if (typeof val === 'string') {
+    trust = [val]
+  } else if (Array.isArray(val)) {
+    trust = val.slice()
+  } else {
+    throw new TypeError('unsupported trust argument')
  }

  for (var i = 0; i < trust.length; i++) {
-    val = trust[i];
+    val = trust[i]

-    if (!ipranges.hasOwnProperty(val)) {
-      continue;
+    if (!Object.prototype.hasOwnProperty.call(IP_RANGES, val)) {
+      continue
    }

    // Splice in pre-defined range
-    val = ipranges[val];
-    trust.splice.apply(trust, [i, 1].concat(val));
-    i += val.length - 1;
+    val = IP_RANGES[val]
+    trust.splice.apply(trust, [i, 1].concat(val))
+    i += val.length - 1
  }

-  return compileTrust(compileRangeSubnets(trust));
+  return compileTrust(compileRangeSubnets(trust))
 }

 /**
 * Compile `arr` elements into range subnets.
 *
 * @param {Array} arr
- * @api private
+ * @private
 */

-function compileRangeSubnets(arr) {
-  var rangeSubnets = new Array(arr.length);
+function compileRangeSubnets (arr) {
+  var rangeSubnets = new Array(arr.length)

  for (var i = 0; i < arr.length; i++) {
-    rangeSubnets[i] = parseipNotation(arr[i]);
+    rangeSubnets[i] = parseipNotation(arr[i])
  }

-  return rangeSubnets;
+  return rangeSubnets
 }

 /**
 * Compile range subnet array into trust function.
 *
 * @param {Array} rangeSubnets
- * @api private
+ * @private
 */

-function compileTrust(rangeSubnets) {
+function compileTrust (rangeSubnets) {
  // Return optimized function based on length
-  var len = rangeSubnets.length;
+  var len = rangeSubnets.length
  return len === 0
    ? trustNone
    : len === 1
-    ? trustSingle(rangeSubnets[0])
-    : trustMulti(rangeSubnets);
+      ? trustSingle(rangeSubnets[0])
+      : trustMulti(rangeSubnets)
 }

 /**
 * Parse IP notation string into range subnet.
 *
 * @param {String} note
- * @api private
+ * @private
 */

-function parseipNotation(note) {
-  var ip;
-  var kind;
-  var max;
-  var pos = note.lastIndexOf('/');
-  var range;
-
-  ip = pos !== -1
+function parseipNotation (note) {
+  var pos = note.lastIndexOf('/')
+  var str = pos !== -1
    ? note.substring(0, pos)
-    : note;
+    : note

-  if (!isip(ip)) {
-    throw new TypeError('invalid IP address: ' + ip);
+  if (!isip(str)) {
+    throw new TypeError('invalid IP address: ' + str)
  }

-  ip = parseip(ip);
+  var ip = parseip(str)

-  kind = ip.kind();
-  max = kind === 'ipv6'
-    ? 128
-    : 32;
-
-  range = pos !== -1
-    ? note.substring(pos + 1, note.length)
-    : max;
-
-  if (typeof range !== 'number') {
-    range = digitre.test(range)
-      ? parseInt(range, 10)
-      : isip(range)
-      ? parseNetmask(range)
-      : 0;
-  }
-
-  if (ip.kind() === 'ipv6' && ip.isIPv4MappedAddress()) {
+  if (pos === -1 && ip.kind() === 'ipv6' && ip.isIPv4MappedAddress()) {
    // Store as IPv4
-    ip = ip.toIPv4Address();
-    range = range <= max
-      ? range - 96
-      : range;
+    ip = ip.toIPv4Address()
+  }
+
+  var max = ip.kind() === 'ipv6'
+    ? 128
+    : 32
+
+  var range = pos !== -1
+    ? note.substring(pos + 1, note.length)
+    : null
+
+  if (range === null) {
+    range = max
+  } else if (DIGIT_REGEXP.test(range)) {
+    range = parseInt(range, 10)
+  } else if (ip.kind() === 'ipv4' && isip(range)) {
+    range = parseNetmask(range)
+  } else {
+    range = null
  }

  if (range <= 0 || range > max) {
-    throw new TypeError('invalid range on address: ' + note);
+    throw new TypeError('invalid range on address: ' + note)
  }

-  return [ip, range];
+  return [ip, range]
 }

 /**
 * Parse netmask string into CIDR range.
 *
- * @param {String} note
- * @api private
+ * @param {String} netmask
+ * @private
 */

-function parseNetmask(netmask) {
-  var ip = parseip(netmask);
-  var parts;
-  var size;
+function parseNetmask (netmask) {
+  var ip = parseip(netmask)
+  var kind = ip.kind()

-  switch (ip.kind()) {
-    case 'ipv4':
-      parts = ip.octets;
-      size = 8;
-      break;
-    case 'ipv6':
-      parts = ip.parts;
-      size = 16;
-      break;
-  }
-
-  var max = Math.pow(2, size) - 1;
-  var part;
-  var range = 0;
-
-  for (var i = 0; i < parts.length; i++) {
-    part = parts[i] & max;
-
-    if (part === max) {
-      range += size;
-      continue;
-    }
-
-    while (part) {
-      part = (part << 1) & max;
-      range += 1;
-    }
-
-    break;
-  }
-
-  return range;
+  return kind === 'ipv4'
+    ? ip.prefixLengthFromSubnetMask()
+    : null
 }

 /**
@@ -247,101 +216,112 @@ function parseNetmask(netmask) {
 *
 * @param {Object} request
 * @param {Function|Array|String} trust
- * @api public
+ * @public
 */

-function proxyaddr(req, trust) {
+function proxyaddr (req, trust) {
  if (!req) {
-    throw new TypeError('req argument is required');
+    throw new TypeError('req argument is required')
  }

  if (!trust) {
-    throw new TypeError('trust argument is required');
+    throw new TypeError('trust argument is required')
  }

-  var addrs = alladdrs(req, trust);
-  var addr = addrs[addrs.length - 1];
+  var addrs = alladdrs(req, trust)
+  var addr = addrs[addrs.length - 1]

-  return addr;
+  return addr
 }

 /**
 * Static trust function to trust nothing.
 *
- * @api private
+ * @private
 */

-function trustNone() {
-  return false;
+function trustNone () {
+  return false
 }

 /**
 * Compile trust function for multiple subnets.
 *
 * @param {Array} subnets
- * @api private
+ * @private
 */

-function trustMulti(subnets) {
-  return function trust(addr) {
-    if (!isip(addr)) return false;
+function trustMulti (subnets) {
+  return function trust (addr) {
+    if (!isip(addr)) return false

-    var ip = parseip(addr);
-    var ipv4;
-    var kind = ip.kind();
-    var subnet;
-    var subnetip;
-    var subnetkind;
-    var subnetrange;
-    var trusted;
+    var ip = parseip(addr)
+    var ipconv
+    var kind = ip.kind()

    for (var i = 0; i < subnets.length; i++) {
-      subnet = subnets[i];
-      subnetip = subnet[0];
-      subnetkind = subnetip.kind();
-      subnetrange = subnet[1];
-      trusted = ip;
+      var subnet = subnets[i]
+      var subnetip = subnet[0]
+      var subnetkind = subnetip.kind()
+      var subnetrange = subnet[1]
+      var trusted = ip

      if (kind !== subnetkind) {
-        if (kind !== 'ipv6' || subnetkind !== 'ipv4' || !ip.isIPv4MappedAddress()) {
-          continue;
+        if (subnetkind === 'ipv4' && !ip.isIPv4MappedAddress()) {
+          // Incompatible IP addresses
+          continue
        }

-        // Store addr as IPv4
-        ipv4 = ipv4 || ip.toIPv4Address();
-        trusted = ipv4;
+        if (!ipconv) {
+          // Convert IP to match subnet IP kind
+          ipconv = subnetkind === 'ipv4'
+            ? ip.toIPv4Address()
+            : ip.toIPv4MappedAddress()
+        }
+
+        trusted = ipconv
      }

-      if (trusted.match(subnetip, subnetrange)) return true;
+      if (trusted.match(subnetip, subnetrange)) {
+        return true
+      }
    }

-    return false;
-  };
+    return false
+  }
 }

 /**
 * Compile trust function for single subnet.
 *
 * @param {Object} subnet
- * @api private
+ * @private
 */

-function trustSingle(subnet) {
-  var subnetip = subnet[0];
-  var subnetkind = subnetip.kind();
-  var subnetisipv4 = subnetkind === 'ipv4';
-  var subnetrange = subnet[1];
+function trustSingle (subnet) {
+  var subnetip = subnet[0]
+  var subnetkind = subnetip.kind()
+  var subnetisipv4 = subnetkind === 'ipv4'
+  var subnetrange = subnet[1]

-  return function trust(addr) {
-    if (!isip(addr)) return false;
+  return function trust (addr) {
+    if (!isip(addr)) return false

-    var ip = parseip(addr);
-    var kind = ip.kind();
+    var ip = parseip(addr)
+    var kind = ip.kind()

-    return kind === subnetkind
-      ? ip.match(subnetip, subnetrange)
-      : subnetisipv4 && kind === 'ipv6' && ip.isIPv4MappedAddress()
-      ? ip.toIPv4Address().match(subnetip, subnetrange)
-      : false;
-  };
+    if (kind !== subnetkind) {
+      if (subnetisipv4 && !ip.isIPv4MappedAddress()) {
+        // Incompatible IP addresses
+        return false
+      }
+
+      // Convert IP to match subnet IP kind
+      ip = subnetisipv4
+        ? ip.toIPv4Address()
+        : ip.toIPv4MappedAddress()
+    }
+
+    return ip.match(subnetip, subnetrange)
+  }
 }
--- a/node_modules/proxy-addr/package.json
+++ b/node_modules/proxy-addr/package.json
@@ -1,7 +1,7 @@
 {
  "name": "proxy-addr",
  "description": "Determine address of proxied request",
-  "version": "1.0.10",
+  "version": "2.0.7",
  "author": "Douglas Christopher Wilson <doug@somethingdoug.com>",
  "license": "MIT",
  "keywords": [
@@ -11,14 +11,22 @@
  ],
  "repository": "jshttp/proxy-addr",
  "dependencies": {
-    "forwarded": "~0.1.0",
-    "ipaddr.js": "1.0.5"
+    "forwarded": "0.2.0",
+    "ipaddr.js": "1.9.1"
  },
  "devDependencies": {
-    "benchmark": "1.0.0",
+    "benchmark": "2.1.4",
    "beautify-benchmark": "0.2.4",
-    "istanbul": "0.4.1",
-    "mocha": "~1.21.5"
+    "deep-equal": "1.0.1",
+    "eslint": "7.26.0",
+    "eslint-config-standard": "14.1.1",
+    "eslint-plugin-import": "2.23.4",
+    "eslint-plugin-markdown": "2.2.0",
+    "eslint-plugin-node": "11.1.0",
+    "eslint-plugin-promise": "4.3.1",
+    "eslint-plugin-standard": "4.1.0",
+    "mocha": "8.4.0",
+    "nyc": "15.1.0"
  },
  "files": [
    "LICENSE",
@@ -27,12 +35,13 @@
    "index.js"
  ],
  "engines": {
-    "node": ">= 0.6"
+    "node": ">= 0.10"
  },
  "scripts": {
    "bench": "node benchmark/index.js",
+    "lint": "eslint .",
    "test": "mocha --reporter spec --bail --check-leaks test/",
-    "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --reporter dot --check-leaks test/",
-    "test-travis": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter spec --check-leaks test/"
+    "test-ci": "nyc --reporter=lcov --reporter=text npm test",
+    "test-cov": "nyc --reporter=html --reporter=text npm test"
  }
 }