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

Fixes: #8165 PR-URL: #8215 Reviewed-By: James M Snell <[email protected]>
nodejs · Aug 24, 2016 · 51f96df · 51f96df
1 parent 09f861f
commit 51f96df
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/url.js b/lib/url.js
@@ -780,13 +780,13 @@ Url.prototype.resolveObject = function(relative) {
   if (isRelAbs) {
     // it's absolute.
     if (relative.host || relative.host === '') {
+      if (result.host !== relative.host) result.auth = null;
       result.host = relative.host;
       result.port = relative.port;
-      result.auth = null;
     }
     if (relative.hostname || relative.hostname === '') {
+      if (result.hostname !== relative.hostname) result.auth = null;
       result.hostname = relative.hostname;
-      result.auth = null;
     }
     result.search = relative.search;
     result.query = relative.query;

diff --git a/test/parallel/test-url.js b/test/parallel/test-url.js
@@ -1588,6 +1588,9 @@ var relativeTests2 = [
   ['mailto:another.host.com',
    'mailto:[email protected]',
    'mailto:another.host.com'],
+  ['https://example.com/foo',
+   'https://user:[email protected]',
+   'https://user:[email protected]/foo'],
 ];
 relativeTests2.forEach(function(relativeTest) {
   const a = url.resolve(relativeTest[1], relativeTest[0]);