Skip to content

fix: do not switch to git+ssh for https repository links #434

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
oldium wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −10
Open

fix: do not switch to git+ssh for https repository links #434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/git.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion lib/util/add-git-sha.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
11 changes: 6 additions & 5 deletions test/git.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,13 +670,14 @@ t.test('repoUrl function', { skip: isWindows && 'posix only' }, async t => {
const { hosted: ssh } = npa(`git+ssh://git@github.com/${proj}`)
const { hosted: git } = npa(`git://github.com/${proj}`)
const { repoUrl } = GitFetcher
const expectNoAuth = `git+ssh://git@github.com/${proj}`
const expectNoAuthSsh = `git+ssh://git@github.com/${proj}`
const expectNoAuthHttps = `git+https://github.com/${proj}`
const expectAuth = `git+https://user:pass@github.com/${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' },
Expand Down
6 changes: 3 additions & 3 deletions test/util/add-git-sha.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ const cases = [
'sha',
'https://git@github.com/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://git@github.com/user/repo', 'sha', 'github:user/repo#sha'],
['git+ssh://git@github.com/user/repo#othersha', 'sha', 'github:user/repo#sha'],
Expand Down