bugfix: do not switch to git+ssh for https repository links

When the URL explicitly contains https, do not try to switch to ssh. This
change is necessary for [npm][3] to retain the protocol, please see the
link and the referenced issues [here][1] and [here][2] reporting problems
when using ssh instead of requested https.

[1]: npm/cli#2610
[2]: npm/cli#4305
[3]: npm/cli#8703

Signed-off-by: Oldřich Jedlička <[email protected]>

Author: oldium

lib/git.js

@@ -19,7 +19,7 @@ const hashre = /^[a-f0-9]{40}$/
 // otherwise, prefer ssh if available (more secure).
 // We have to add the git+ back because npa suppresses it.
 const repoUrl = (h, opts) =>
-  h.sshurl && !(h.https && h.auth) && addGitPlus(h.sshurl(opts)) ||
+  h.sshurl && !(h.https && (h.auth || h.default === 'https')) && addGitPlus(h.sshurl(opts)) ||
   h.https && addGitPlus(h.https(opts))
 
 // add git+ to the url, but only one time.

lib/util/add-git-sha.js

@@ -3,7 +3,7 @@ const addGitSha = (spec, sha) => {
   if (spec.hosted) {
     const h = spec.hosted
     const opt = { noCommittish: true }
-    const base = h.https && h.auth ? h.https(opt) : h.shortcut(opt)
+    const base = h.https && (h.auth || h.default === 'https') ? h.https(opt) : h.shortcut(opt)
 
     return `${base}#${sha}`
   } else {

test/git.js

@@ -670,13 +670,14 @@ t.test('repoUrl function', { skip: isWindows && 'posix only' }, async t => {
   const { hosted: ssh } = npa(`git+ssh://[email protected]/${proj}`)
   const { hosted: git } = npa(`git://github.com/${proj}`)
   const { repoUrl } = GitFetcher
-  const expectNoAuth = `git+ssh://[email protected]/${proj}`
+  const expectNoAuthSsh = `git+ssh://[email protected]/${proj}`
+  const expectNoAuthHttps = `git+https://github.com/${proj}`
   const expectAuth = `git+https://user:[email protected]/${proj}`
-  t.match(repoUrl(shortcut), expectNoAuth)
+  t.match(repoUrl(shortcut), expectNoAuthSsh)
   t.match(repoUrl(hasAuth), expectAuth)
-  t.match(repoUrl(noAuth), expectNoAuth)
-  t.match(repoUrl(ssh), expectNoAuth)
-  t.match(repoUrl(git), expectNoAuth)
+  t.match(repoUrl(noAuth), expectNoAuthHttps)
+  t.match(repoUrl(ssh), expectNoAuthSsh)
+  t.match(repoUrl(git), expectNoAuthSsh)
 })
 
 t.test('handle it when prepared git deps depend on each other', { skip: isWindows && 'posix only' },

test/util/add-git-sha.js

@@ -28,9 +28,9 @@ const cases = [
     'sha',
     'https://[email protected]/user/repo.git#sha'],
   // github https no auth
-  ['git+https://github.com/user/repo', 'sha', 'github:user/repo#sha'],
-  ['git+https://github.com/user/repo#othersha', 'sha', 'github:user/repo#sha'],
-  ['git+https://github.com/user/repo#othersha#otherothersha', 'sha', 'github:user/repo#sha'],
+  ['git+https://github.com/user/repo', 'sha', 'https://github.com/user/repo.git#sha'],
+  ['git+https://github.com/user/repo#othersha', 'sha', 'https://github.com/user/repo.git#sha'],
+  ['git+https://github.com/user/repo#othersha#otherothersha', 'sha', 'https://github.com/user/repo.git#sha'],
   // github ssh
   ['git+ssh://[email protected]/user/repo', 'sha', 'github:user/repo#sha'],
   ['git+ssh://[email protected]/user/repo#othersha', 'sha', 'github:user/repo#sha'],