Update dependencies
This commit is contained in:
Daniel Rodriguez
parent
cc79cf906f
commit
0add34a8b6
17 changed files with 1098 additions and 3723 deletions
150
node_modules/proxy-addr/HISTORY.md
generated
vendored
150
node_modules/proxy-addr/HISTORY.md
generated
vendored
|
|
@ -1,150 +0,0 @@
|
|||
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
|
||||
===================
|
||||
|
||||
* deps: ipaddr.js@1.0.5
|
||||
- Fix regression in `isValid` with non-string arguments
|
||||
|
||||
1.0.9 / 2015-12-01
|
||||
==================
|
||||
|
||||
* deps: ipaddr.js@1.0.4
|
||||
- Fix accepting some invalid IPv6 addresses
|
||||
- Reject CIDRs with negative or overlong masks
|
||||
* perf: enable strict mode
|
||||
|
||||
1.0.8 / 2015-05-10
|
||||
==================
|
||||
|
||||
* deps: ipaddr.js@1.0.1
|
||||
|
||||
1.0.7 / 2015-03-16
|
||||
==================
|
||||
|
||||
* deps: ipaddr.js@0.1.9
|
||||
- Fix OOM on certain inputs to `isValid`
|
||||
|
||||
1.0.6 / 2015-02-01
|
||||
==================
|
||||
|
||||
* deps: ipaddr.js@0.1.8
|
||||
|
||||
1.0.5 / 2015-01-08
|
||||
==================
|
||||
|
||||
* deps: ipaddr.js@0.1.6
|
||||
|
||||
1.0.4 / 2014-11-23
|
||||
==================
|
||||
|
||||
* deps: ipaddr.js@0.1.5
|
||||
- Fix edge cases with `isValid`
|
||||
|
||||
1.0.3 / 2014-09-21
|
||||
==================
|
||||
|
||||
* Use `forwarded` npm module
|
||||
|
||||
1.0.2 / 2014-09-18
|
||||
==================
|
||||
|
||||
* Fix a global leak when multiple subnets are trusted
|
||||
* Support Node.js 0.6
|
||||
* deps: ipaddr.js@0.1.3
|
||||
|
||||
1.0.1 / 2014-06-03
|
||||
==================
|
||||
|
||||
* Fix links in npm package
|
||||
|
||||
1.0.0 / 2014-05-08
|
||||
==================
|
||||
|
||||
* Add `trust` argument to determine proxy trust on
|
||||
* Accepts custom function
|
||||
* Accepts IPv4/IPv6 address(es)
|
||||
* Accepts subnets
|
||||
* Accepts pre-defined names
|
||||
* Add optional `trust` argument to `proxyaddr.all` to
|
||||
stop at first untrusted
|
||||
* Add `proxyaddr.compile` to pre-compile `trust` function
|
||||
to make subsequent calls faster
|
||||
|
||||
0.0.1 / 2014-05-04
|
||||
==================
|
||||
|
||||
* Fix bad npm publish
|
||||
|
||||
0.0.0 / 2014-05-04
|
||||
==================
|
||||
|
||||
* Initial release
|
||||
327
node_modules/proxy-addr/index.js
generated
vendored
327
node_modules/proxy-addr/index.js
generated
vendored
|
|
@ -1,327 +0,0 @@
|
|||
/*!
|
||||
* proxy-addr
|
||||
* Copyright(c) 2014-2016 Douglas Christopher Wilson
|
||||
* MIT Licensed
|
||||
*/
|
||||
|
||||
'use strict'
|
||||
|
||||
/**
|
||||
* Module exports.
|
||||
* @public
|
||||
*/
|
||||
|
||||
module.exports = proxyaddr
|
||||
module.exports.all = alladdrs
|
||||
module.exports.compile = compile
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
* @private
|
||||
*/
|
||||
|
||||
var forwarded = require('forwarded')
|
||||
var ipaddr = require('ipaddr.js')
|
||||
|
||||
/**
|
||||
* Variables.
|
||||
* @private
|
||||
*/
|
||||
|
||||
var DIGIT_REGEXP = /^[0-9]+$/
|
||||
var isip = ipaddr.isValid
|
||||
var parseip = ipaddr.parse
|
||||
|
||||
/**
|
||||
* Pre-defined IP ranges.
|
||||
* @private
|
||||
*/
|
||||
|
||||
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
|
||||
* at the first untrusted.
|
||||
*
|
||||
* @param {Object} request
|
||||
* @param {Function|Array|String} [trust]
|
||||
* @public
|
||||
*/
|
||||
|
||||
function alladdrs (req, trust) {
|
||||
// get addresses
|
||||
var addrs = forwarded(req)
|
||||
|
||||
if (!trust) {
|
||||
// Return all addresses
|
||||
return addrs
|
||||
}
|
||||
|
||||
if (typeof trust !== 'function') {
|
||||
trust = compile(trust)
|
||||
}
|
||||
|
||||
for (var i = 0; i < addrs.length - 1; i++) {
|
||||
if (trust(addrs[i], i)) continue
|
||||
|
||||
addrs.length = i + 1
|
||||
}
|
||||
|
||||
return addrs
|
||||
}
|
||||
|
||||
/**
|
||||
* Compile argument into trust function.
|
||||
*
|
||||
* @param {Array|String} val
|
||||
* @private
|
||||
*/
|
||||
|
||||
function compile (val) {
|
||||
if (!val) {
|
||||
throw new TypeError('argument is required')
|
||||
}
|
||||
|
||||
var trust
|
||||
|
||||
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]
|
||||
|
||||
if (!IP_RANGES.hasOwnProperty(val)) {
|
||||
continue
|
||||
}
|
||||
|
||||
// Splice in pre-defined range
|
||||
val = IP_RANGES[val]
|
||||
trust.splice.apply(trust, [i, 1].concat(val))
|
||||
i += val.length - 1
|
||||
}
|
||||
|
||||
return compileTrust(compileRangeSubnets(trust))
|
||||
}
|
||||
|
||||
/**
|
||||
* Compile `arr` elements into range subnets.
|
||||
*
|
||||
* @param {Array} arr
|
||||
* @private
|
||||
*/
|
||||
|
||||
function compileRangeSubnets (arr) {
|
||||
var rangeSubnets = new Array(arr.length)
|
||||
|
||||
for (var i = 0; i < arr.length; i++) {
|
||||
rangeSubnets[i] = parseipNotation(arr[i])
|
||||
}
|
||||
|
||||
return rangeSubnets
|
||||
}
|
||||
|
||||
/**
|
||||
* Compile range subnet array into trust function.
|
||||
*
|
||||
* @param {Array} rangeSubnets
|
||||
* @private
|
||||
*/
|
||||
|
||||
function compileTrust (rangeSubnets) {
|
||||
// Return optimized function based on length
|
||||
var len = rangeSubnets.length
|
||||
return len === 0
|
||||
? trustNone
|
||||
: len === 1
|
||||
? trustSingle(rangeSubnets[0])
|
||||
: trustMulti(rangeSubnets)
|
||||
}
|
||||
|
||||
/**
|
||||
* Parse IP notation string into range subnet.
|
||||
*
|
||||
* @param {String} note
|
||||
* @private
|
||||
*/
|
||||
|
||||
function parseipNotation (note) {
|
||||
var pos = note.lastIndexOf('/')
|
||||
var str = pos !== -1
|
||||
? note.substring(0, pos)
|
||||
: note
|
||||
|
||||
if (!isip(str)) {
|
||||
throw new TypeError('invalid IP address: ' + str)
|
||||
}
|
||||
|
||||
var ip = parseip(str)
|
||||
|
||||
if (pos === -1 && ip.kind() === 'ipv6' && ip.isIPv4MappedAddress()) {
|
||||
// Store as IPv4
|
||||
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)
|
||||
}
|
||||
|
||||
return [ip, range]
|
||||
}
|
||||
|
||||
/**
|
||||
* Parse netmask string into CIDR range.
|
||||
*
|
||||
* @param {String} netmask
|
||||
* @private
|
||||
*/
|
||||
|
||||
function parseNetmask (netmask) {
|
||||
var ip = parseip(netmask)
|
||||
var kind = ip.kind()
|
||||
|
||||
return kind === 'ipv4'
|
||||
? ip.prefixLengthFromSubnetMask()
|
||||
: null
|
||||
}
|
||||
|
||||
/**
|
||||
* Determine address of proxied request.
|
||||
*
|
||||
* @param {Object} request
|
||||
* @param {Function|Array|String} trust
|
||||
* @public
|
||||
*/
|
||||
|
||||
function proxyaddr (req, trust) {
|
||||
if (!req) {
|
||||
throw new TypeError('req argument is required')
|
||||
}
|
||||
|
||||
if (!trust) {
|
||||
throw new TypeError('trust argument is required')
|
||||
}
|
||||
|
||||
var addrs = alladdrs(req, trust)
|
||||
var addr = addrs[addrs.length - 1]
|
||||
|
||||
return addr
|
||||
}
|
||||
|
||||
/**
|
||||
* Static trust function to trust nothing.
|
||||
*
|
||||
* @private
|
||||
*/
|
||||
|
||||
function trustNone () {
|
||||
return false
|
||||
}
|
||||
|
||||
/**
|
||||
* Compile trust function for multiple subnets.
|
||||
*
|
||||
* @param {Array} subnets
|
||||
* @private
|
||||
*/
|
||||
|
||||
function trustMulti (subnets) {
|
||||
return function trust (addr) {
|
||||
if (!isip(addr)) return false
|
||||
|
||||
var ip = parseip(addr)
|
||||
var ipconv
|
||||
var kind = ip.kind()
|
||||
|
||||
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
|
||||
|
||||
if (kind !== subnetkind) {
|
||||
if (subnetkind === 'ipv4' && !ip.isIPv4MappedAddress()) {
|
||||
// Incompatible IP addresses
|
||||
continue
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
}
|
||||
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Compile trust function for single subnet.
|
||||
*
|
||||
* @param {Object} subnet
|
||||
* @private
|
||||
*/
|
||||
|
||||
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
|
||||
|
||||
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)
|
||||
}
|
||||
}
|
||||
82
node_modules/proxy-addr/package.json
generated
vendored
82
node_modules/proxy-addr/package.json
generated
vendored
|
|
@ -1,82 +0,0 @@
|
|||
{
|
||||
"_from": "proxy-addr@~2.0.5",
|
||||
"_id": "proxy-addr@2.0.5",
|
||||
"_inBundle": false,
|
||||
"_integrity": "sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==",
|
||||
"_location": "/proxy-addr",
|
||||
"_phantomChildren": {},
|
||||
"_requested": {
|
||||
"type": "range",
|
||||
"registry": true,
|
||||
"raw": "proxy-addr@~2.0.5",
|
||||
"name": "proxy-addr",
|
||||
"escapedName": "proxy-addr",
|
||||
"rawSpec": "~2.0.5",
|
||||
"saveSpec": null,
|
||||
"fetchSpec": "~2.0.5"
|
||||
},
|
||||
"_requiredBy": [
|
||||
"/express"
|
||||
],
|
||||
"_resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz",
|
||||
"_shasum": "34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34",
|
||||
"_spec": "proxy-addr@~2.0.5",
|
||||
"_where": "D:\\TFTPaths\\node_modules\\express",
|
||||
"author": {
|
||||
"name": "Douglas Christopher Wilson",
|
||||
"email": "doug@somethingdoug.com"
|
||||
},
|
||||
"bugs": {
|
||||
"url": "https://github.com/jshttp/proxy-addr/issues"
|
||||
},
|
||||
"bundleDependencies": false,
|
||||
"dependencies": {
|
||||
"forwarded": "~0.1.2",
|
||||
"ipaddr.js": "1.9.0"
|
||||
},
|
||||
"deprecated": false,
|
||||
"description": "Determine address of proxied request",
|
||||
"devDependencies": {
|
||||
"beautify-benchmark": "0.2.4",
|
||||
"benchmark": "2.1.4",
|
||||
"deep-equal": "1.0.1",
|
||||
"eslint": "5.16.0",
|
||||
"eslint-config-standard": "12.0.0",
|
||||
"eslint-plugin-import": "2.17.1",
|
||||
"eslint-plugin-markdown": "1.0.0",
|
||||
"eslint-plugin-node": "8.0.1",
|
||||
"eslint-plugin-promise": "4.1.1",
|
||||
"eslint-plugin-standard": "4.0.0",
|
||||
"mocha": "6.1.3",
|
||||
"nyc": "13.3.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">= 0.10"
|
||||
},
|
||||
"files": [
|
||||
"LICENSE",
|
||||
"HISTORY.md",
|
||||
"README.md",
|
||||
"index.js"
|
||||
],
|
||||
"homepage": "https://github.com/jshttp/proxy-addr#readme",
|
||||
"keywords": [
|
||||
"ip",
|
||||
"proxy",
|
||||
"x-forwarded-for"
|
||||
],
|
||||
"license": "MIT",
|
||||
"name": "proxy-addr",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "git+https://github.com/jshttp/proxy-addr.git"
|
||||
},
|
||||
"scripts": {
|
||||
"bench": "node benchmark/index.js",
|
||||
"lint": "eslint --plugin markdown --ext js,md .",
|
||||
"test": "mocha --reporter spec --bail --check-leaks test/",
|
||||
"test-cov": "nyc --reporter=text npm test",
|
||||
"test-travis": "nyc --reporter=html --reporter=text npm test"
|
||||
},
|
||||
"version": "2.0.5"
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue