mirror/pnpm
1
0
Fork 0
mirror of https://github.com/pnpm/pnpm.git synced 2026-03-30 04:52:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(git-resolver): supports ssh port (#3947)

Browse Source 
close #3944

Co-authored-by: liucheng.leo <chengcyber@outlook.com>
Co-authored-by: Zoltan Kochan <z@kochan.io>
This commit is contained in:
Cheng
2021-11-04 05:42:52 +08:00
committed by GitHub
parent d577dba773
commit 7da65bd7a9
4 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.changeset/clean-dolphins-lay.md Normal file
View File

@@ -0,0 +1,5 @@
---
"@pnpm/git-resolver": patch
---
Don't break URLs with ports.

4
packages/git-resolver/src/parsePref.ts
View File

@@ -61,7 +61,7 @@ export default async function parsePref (pref: string): Promise<HostedPackageSpe
function escapeColon (url: string) {
if (!url.includes('@')) return url
const [front, ...backs] = url.split('@')
const escapedBacks = backs.map(e => e.replace(/:([^/])/, ':/$1'))
const escapedBacks = backs.map(e => e.replace(/:([^/\d]|\d+[^:/\d])/, ':/$1'))
return [front, ...escapedBacks].join('@')
}
@@ -161,7 +161,7 @@ function matchGitScp (spec: string) {
// git+ssh://git@my.custom.git.com:username/project.git#deadbeef
//
// ...and various combinations. The username in the beginning is *required*.
const matched = spec.match(/^git\+ssh:\/\/([^:#]+:[^#]+(?:\.git)?)(?:#(.*))?$/i)
const matched = spec.match(/^git\+ssh:\/\/([^:]+:[^#]+(?:\.git)?)(?:#(.*))$/i)
return (matched != null) && (matched[1].match(/:[0-9]+\/?.*$/i) == null) && {
fetchSpec: matched[1],
gitCommittish: matched[2],

12
packages/git-resolver/test/index.ts
View File

@@ -331,6 +331,18 @@ test('resolveFromGit() normalizes full url', async () => {
})
})
test('resolveFromGit() normalizes full url with port', async () => {
const resolveResult = await resolveFromGit({ pref: 'git+ssh://git@github.com:22:zkochan/is-negative.git#2.0.1' })
expect(resolveResult).toStrictEqual({
id: 'github.com/zkochan/is-negative/2fa0531ab04e300a24ef4fd7fb3a280eccb7ccc5',
normalizedPref: 'github:zkochan/is-negative#2.0.1',
resolution: {
tarball: 'https://codeload.github.com/zkochan/is-negative/tar.gz/2fa0531ab04e300a24ef4fd7fb3a280eccb7ccc5',
},
resolvedVia: 'git-repository',
})
})
test('resolveFromGit() normalizes full url (alternative form)', async () => {
const resolveResult = await resolveFromGit({ pref: 'git+ssh://git@github.com/zkochan/is-negative.git#2.0.1' })
expect(resolveResult).toStrictEqual({

7
packages/git-resolver/test/parsePref.test.ts
View File

@@ -3,7 +3,12 @@ import parsePref from '@pnpm/git-resolver/lib/parsePref'
test.each([
['ssh://username:password@example.com:repo.git', 'ssh://username:password@example.com/repo.git'],
['ssh://username:password@example.com:repo/@foo.git', 'ssh://username:password@example.com/repo/@foo.git'],
])('the right colon is escaped', async (input, output) => {
['ssh://username:password@example.com:22/repo/@foo.git', 'ssh://username:password@example.com:22/repo/@foo.git'],
['ssh://username:password@example.com:22repo/@foo.git', 'ssh://username:password@example.com/22repo/@foo.git'],
['git+ssh://username:password@example.com:repo.git', 'ssh://username:password@example.com/repo.git'],
['git+ssh://username:password@example.com:repo/@foo.git', 'ssh://username:password@example.com/repo/@foo.git'],
['git+ssh://username:password@example.com:22/repo/@foo.git', 'ssh://username:password@example.com:22/repo/@foo.git'],
])('the right colon is escaped in %s', async (input, output) => {
const parsed = await parsePref(input)
expect(parsed?.fetchSpec).toBe(output)
})