1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

url: keep auth in url.resolve() if host matches

Browse Source 
Fixes: https://github.com/nodejs/node/issues/8165

PR-URL: https://github.com/nodejs/node/pull/8215
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
Ilkka Myller 2016-08-19 22:59:20 +03:00 committed by James M Snell
parent 09f861f231
commit 51f96dfcfc
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/url.js
View File

@ -780,13 +780,13 @@ Url.prototype.resolveObject = function(relative) {
if (isRelAbs) { if (isRelAbs) {
// it's absolute. // it's absolute.
if (relative.host || relative.host === '') { if (relative.host || relative.host === '') {
if (result.host !== relative.host) result.auth = null;
result.host = relative.host; result.host = relative.host;
result.port = relative.port; result.port = relative.port;
result.auth = null;
} }
if (relative.hostname || relative.hostname === '') { if (relative.hostname || relative.hostname === '') {
if (result.hostname !== relative.hostname) result.auth = null;
result.hostname = relative.hostname; result.hostname = relative.hostname;
result.auth = null;
} }
result.search = relative.search; result.search = relative.search;
result.query = relative.query; result.query = relative.query;

3
test/parallel/test-url.js
View File

@ -1588,6 +1588,9 @@ var relativeTests2 = [
['mailto:another.host.com', ['mailto:another.host.com',
'mailto:user@example.org', 'mailto:user@example.org',
'mailto:another.host.com'], 'mailto:another.host.com'],
['https://example.com/foo',
'https://user:password@example.com',
'https://user:password@example.com/foo'],
]; ];
relativeTests2.forEach(function(relativeTest) { relativeTests2.forEach(function(relativeTest) {
const a = url.resolve(relativeTest[1], relativeTest[0]); const a = url.resolve(relativeTest[1], relativeTest[0]);