archive-gh-me/node-http-proxy
1
0
Fork 0
mirror of https://github.com/http-party/node-http-proxy.git synced 2025-12-08 20:59:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #699 from STRML/master

Browse Source 
Urgent: Fix breaking bug on url joining resulting in paths like `///path`.
This commit is contained in:
Arnout Kazemier 2014-09-12 19:10:30 +02:00
commit 107b9da256
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/http-proxy/common.js
View File

@ -71,9 +71,7 @@ common.setupOutgoing = function(outgoing, options, req, forward) {
? url.parse(req.url).path
: req.url;
outgoing.path = targetPath
? targetPath + '/' + outgoingPath
: outgoingPath;
outgoing.path = common.urlJoin(targetPath, outgoingPath);
return outgoing;
};
@ -109,4 +107,12 @@ common.getPort = function(req) {
return res ?
res[1] :
req.connection.pair ? '443' : '80' ;
}
};
// OS-agnostic join (doesn't break on URLs like path.join does on Windows)
common.urlJoin = function() {
var args = Array.prototype.slice.call(arguments);
// Join all strings, but remove empty strings so we don't get extra slashes from
// joining e.g. ['', 'am']
return args.filter(function(a) { return !!a; }).join('/').replace(/\/+/g, '/');
};

9
test/lib-http-proxy-common-test.js
View File

@ -150,6 +150,15 @@ describe('lib/http-proxy/common.js', function () {
expect(outgoing.path).to.eql('hi');
})
it('should properly join paths', function () {
var outgoing = {};
common.setupOutgoing(outgoing, {
target: { path: '/forward' },
}, { url: '/static/path' });
expect(outgoing.path).to.eql('/forward/static/path');
})
});
describe('#setupSocket', function () {