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

This commit is contained in:
2023-11-23 13:21:05 +01:00
parent 6af45b3ee2
commit bdab795506
820 changed files with 82281 additions and 35986 deletions

314
node_modules/proxy-addr/index.js generated vendored
View File

@@ -1,6 +1,6 @@
/*!
* proxy-addr
* Copyright(c) 2014-2016 Douglas Christopher Wilson
* Copyright(c) 2014 Douglas Christopher Wilson
* MIT Licensed
*/
@@ -8,40 +8,36 @@
/**
* 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 DIGIT_REGEXP = /^[0-9]+$/
var isip = ipaddr.isValid
var parseip = ipaddr.parse
var digitre = /^[0-9]+$/;
var isip = ipaddr.isValid;
var parseip = ipaddr.parse;
/**
* Pre-defined IP ranges.
* @private
*/
var IP_RANGES = {
var ipranges = {
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
@@ -49,166 +45,201 @@ var IP_RANGES = {
*
* @param {Object} request
* @param {Function|Array|String} [trust]
* @public
* @api 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
* @private
* @api private
*/
function compile (val) {
function compile(val) {
if (!val) {
throw new TypeError('argument is required')
throw new TypeError('argument is required');
}
var trust
var trust = typeof val === 'string'
? [val]
: val;
if (typeof val === 'string') {
trust = [val]
} else if (Array.isArray(val)) {
trust = val.slice()
} else {
throw new TypeError('unsupported trust argument')
if (!Array.isArray(trust)) {
throw new TypeError('unsupported trust argument');
}
for (var i = 0; i < trust.length; i++) {
val = trust[i]
val = trust[i];
if (!Object.prototype.hasOwnProperty.call(IP_RANGES, val)) {
continue
if (!ipranges.hasOwnProperty(val)) {
continue;
}
// Splice in pre-defined range
val = IP_RANGES[val]
trust.splice.apply(trust, [i, 1].concat(val))
i += val.length - 1
val = ipranges[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
* @private
* @api 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
* @private
* @api 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
* @private
* @api private
*/
function parseipNotation (note) {
var pos = note.lastIndexOf('/')
var str = pos !== -1
function parseipNotation(note) {
var ip;
var kind;
var max;
var pos = note.lastIndexOf('/');
var range;
ip = pos !== -1
? note.substring(0, pos)
: note
: note;
if (!isip(str)) {
throw new TypeError('invalid IP address: ' + str)
if (!isip(ip)) {
throw new TypeError('invalid IP address: ' + ip);
}
var ip = parseip(str)
ip = parseip(ip);
if (pos === -1 && ip.kind() === 'ipv6' && ip.isIPv4MappedAddress()) {
// Store as IPv4
ip = ip.toIPv4Address()
}
var max = ip.kind() === 'ipv6'
kind = ip.kind();
max = kind === 'ipv6'
? 128
: 32
: 32;
var range = pos !== -1
range = pos !== -1
? note.substring(pos + 1, note.length)
: null
: max;
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 (typeof range !== 'number') {
range = digitre.test(range)
? parseInt(range, 10)
: isip(range)
? parseNetmask(range)
: 0;
}
if (ip.kind() === 'ipv6' && ip.isIPv4MappedAddress()) {
// Store as IPv4
ip = ip.toIPv4Address();
range = range <= max
? range - 96
: range;
}
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} netmask
* @private
* @param {String} note
* @api private
*/
function parseNetmask (netmask) {
var ip = parseip(netmask)
var kind = ip.kind()
function parseNetmask(netmask) {
var ip = parseip(netmask);
var parts;
var size;
return kind === 'ipv4'
? ip.prefixLengthFromSubnetMask()
: null
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;
}
/**
@@ -216,112 +247,101 @@ function parseNetmask (netmask) {
*
* @param {Object} request
* @param {Function|Array|String} trust
* @public
* @api 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.
*
* @private
* @api private
*/
function trustNone () {
return false
function trustNone() {
return false;
}
/**
* Compile trust function for multiple subnets.
*
* @param {Array} subnets
* @private
* @api 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 ipconv
var kind = ip.kind()
var ip = parseip(addr);
var ipv4;
var kind = ip.kind();
var subnet;
var subnetip;
var subnetkind;
var subnetrange;
var trusted;
for (var i = 0; i < subnets.length; i++) {
var subnet = subnets[i]
var subnetip = subnet[0]
var subnetkind = subnetip.kind()
var subnetrange = subnet[1]
var trusted = ip
subnet = subnets[i];
subnetip = subnet[0];
subnetkind = subnetip.kind();
subnetrange = subnet[1];
trusted = ip;
if (kind !== subnetkind) {
if (subnetkind === 'ipv4' && !ip.isIPv4MappedAddress()) {
// Incompatible IP addresses
continue
if (kind !== 'ipv6' || subnetkind !== 'ipv4' || !ip.isIPv4MappedAddress()) {
continue;
}
if (!ipconv) {
// Convert IP to match subnet IP kind
ipconv = subnetkind === 'ipv4'
? ip.toIPv4Address()
: ip.toIPv4MappedAddress()
}
trusted = ipconv
// Store addr as IPv4
ipv4 = ipv4 || ip.toIPv4Address();
trusted = ipv4;
}
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
* @private
* @api 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();
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)
}
return kind === subnetkind
? ip.match(subnetip, subnetrange)
: subnetisipv4 && kind === 'ipv6' && ip.isIPv4MappedAddress()
? ip.toIPv4Address().match(subnetip, subnetrange)
: false;
};
}