Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix SyntheticRequest

This commit is contained in:
Alan Plum 2016-02-22 14:31:16 +01:00
parent 2da95acee2
commit ee90edfe45
No known key found for this signature in database
GPG Key ID: 8ED72A9A323B6EFD
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
js/server/modules/@arangodb/foxx/router/request.js
View File

@ -36,7 +36,7 @@ module.exports = class SyntheticRequest {
this._url = parseUrl(req.url);
this._raw = req;
this.context = context;
this.path = req.path;
this.path = req.url;
this.suffix = req.suffix;
this.queryParams = querystring.decode(this._url.query);
this.pathParams = {};
@ -166,6 +166,7 @@ function extractServer(req, trustProxy) {
(trustProxy && req.headers['x-forwarded-proto'])
|| req.protocol
);
const secure = protocol === 'https';
const hostHeader = (
(trustProxy && req.headers['x-forwarded-host'])
|| req.headers.host
@ -174,7 +175,7 @@ function extractServer(req, trustProxy) {
const match = hostHeader.match(/^(.*):(\d+)$/) || [hostHeader, hostHeader];
if (match) {
hostname = match[1];
port = match[2] ? Number(match[2]) : 80;
port = match[2] ? Number(match[2]) : secure ? 443 : 80;
}
}
return {
@ -188,7 +189,10 @@ function extractServer(req, trustProxy) {
function extractClient(req, trustProxy) {
let ip = req.client.address;
let ips = [ip];
let port = req.client.port;
const port = Number(
(trustProxy && req.headers['x-forwarded-port'])
|| req.client.port
);
const forwardedFor = req.headers['x-forwarded-for'];
if (trustProxy && forwardedFor) {
const tokens = forwardedFor.split(/\s*,\s*/g).filter(Boolean);
@ -197,11 +201,6 @@ function extractClient(req, trustProxy) {
ip = tokens[0];
}
}
const match = ip.match(/^(.*)(:\d+)?$/);
if (match) {
ip = match[1];
port = match[2] || port;
}
return {
ips: ips,
ip: ip,