Skip to content

Commit 30329af

Browse files
committed
Use forwarded npm module
1 parent 63a0f67 commit 30329af

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

HISTORY.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
unreleased
2+
==========
3+
4+
* Use `forwarded` npm module
5+
16
1.0.2 / 2014-09-18
27
==================
38

index.js

+3-10
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ module.exports.compile = compile;
1616
* Module dependencies.
1717
*/
1818

19+
var forwarded = require('forwarded');
1920
var ipaddr = require('ipaddr.js');
2021

2122
/**
@@ -46,16 +47,8 @@ var ipranges = {
4647
*/
4748

4849
function alladdrs(req, trust) {
49-
if (!req) {
50-
throw new TypeError('req argument is required');
51-
}
52-
53-
var proxyAddrs = (req.headers['x-forwarded-for'] || '')
54-
.split(/ *, */)
55-
.filter(Boolean)
56-
.reverse();
57-
var socketAddr = req.connection.remoteAddress;
58-
var addrs = [socketAddr].concat(proxyAddrs);
50+
// get addresses
51+
var addrs = forwarded(req);
5952

6053
if (!trust) {
6154
// Return all addresses

package.json

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
],
1212
"repository": "jshttp/proxy-addr",
1313
"dependencies": {
14+
"forwarded": "~0.1.0",
1415
"ipaddr.js": "0.1.3"
1516
},
1617
"devDependencies": {

0 commit comments

Comments
 (0)