diff --git a/packages/shared/src/sourceControl.ts b/packages/shared/src/sourceControl.ts index ade9f2c482396..cf3cc3c7d5ac6 100644 --- a/packages/shared/src/sourceControl.ts +++ b/packages/shared/src/sourceControl.ts @@ -1,7 +1,8 @@ const SCP_SSH_REMOTE_PATTERN = /^[a-zA-Z0-9._-]+@([^:/]+):/; // Git reads `host:path` as SSH too, leaving the user to ssh config. A single letter is a Windows // drive and `::` names a remote helper. -const USERLESS_SCP_SSH_REMOTE_PATTERN = /^([^@:/\\\s]{2,}):(?!:)\/?[^/\s]+(?:\/[^/\s]+)*\/?$/u; +const USERLESS_SCP_SSH_REMOTE_PATTERN = + /^(\[[^\]@/\\\s]+\]|[^@:/\\\s[\]]{2,}):(?!:)\/?[^/\s]+(?:\/[^/\s]+)*\/?$/u; /** Null unless the remote is `host:path`, with no user. */ export function userlessScpRemoteHost(remoteUrl: string): string | null { diff --git a/packages/source-control-core/src/server/SourceControlProvider.test.ts b/packages/source-control-core/src/server/SourceControlProvider.test.ts index 0af92ad3f924a..70f790226b752 100644 --- a/packages/source-control-core/src/server/SourceControlProvider.test.ts +++ b/packages/source-control-core/src/server/SourceControlProvider.test.ts @@ -18,6 +18,8 @@ it.each([ ["git@github.com:T3Tools/t3code.git", "T3Tools/t3code"], ["github.com:T3Tools/t3code.git", "T3Tools/t3code"], ["gitlab.com:T3Tools/platform/t3code", "T3Tools/platform/t3code"], + ["git@[2001:db8::1]:T3Tools/t3code.git", "T3Tools/t3code"], + ["[2001:db8::1]:T3Tools/t3code.git", "T3Tools/t3code"], ["https://github.com/T3Tools/t3code.git", "T3Tools/t3code"], ["https://github.com/T3Tools/t3code.git?view=compact", "T3Tools/t3code"], ["https://github.com/T3Tools/t3code.git#section", "T3Tools/t3code"], diff --git a/packages/source-control-core/src/server/SourceControlProvider.ts b/packages/source-control-core/src/server/SourceControlProvider.ts index ddc4a8198c606..181164b06e1d4 100644 --- a/packages/source-control-core/src/server/SourceControlProvider.ts +++ b/packages/source-control-core/src/server/SourceControlProvider.ts @@ -107,7 +107,7 @@ export function repositoryPathFromRemoteUrl(url: string | null): string | null { } const match = - /^(?:[^@/\s]+@[^:/\s]+:|[^@:/\\\s]{2,}:(?!:)|(?:ssh|https?|git):\/\/[^/]+\/)((?:[^/\s]+\/)+[^/\s]+?)(?:\.git)?\/?$/iu.exec( + /^(?:[^@/\s]+@(?:\[[^\]@/\s]+\]|[^:/\s[\]]+):|(?:\[[^\]@/\\\s]+\]|[^@:/\\\s[\]]{2,}):(?!:)|(?:ssh|https?|git):\/\/[^/]+\/)((?:[^/\s]+\/)+[^/\s]+?)(?:\.git)?\/?$/iu.exec( trimmed, ); const path = match?.[1]?.trim() ?? ""; diff --git a/packages/source-control-core/src/shared/definition.ts b/packages/source-control-core/src/shared/definition.ts index 167d89a67f878..cadfda90e9909 100644 --- a/packages/source-control-core/src/shared/definition.ts +++ b/packages/source-control-core/src/shared/definition.ts @@ -522,7 +522,7 @@ export function isChangeRequestInProjectRepository( ); } -const SCP_REMOTE = /^[a-zA-Z0-9._-]+@([^:/]+):/; +const SCP_REMOTE = /^[a-zA-Z0-9._-]+@(\[[^\]@/\s]+\]|[^:/[\]]+):/; /** Null when the remote names no host, such as a local path. */ export function parseGitRemoteHost(remoteUrl: string): GitRemoteHost | null { diff --git a/packages/source-control-forgejo/src/server/ForgejoCli.ts b/packages/source-control-forgejo/src/server/ForgejoCli.ts index 5fa49386c37e0..e3778cc21b453 100644 --- a/packages/source-control-forgejo/src/server/ForgejoCli.ts +++ b/packages/source-control-forgejo/src/server/ForgejoCli.ts @@ -167,7 +167,7 @@ export function parseForgejoRemote(value: string) { } } // SCP remotes may omit the username; URL treats these as a custom scheme. - const ssh = /^(?:[^@/]+@)?([^:/]+):([^/].*)$/.exec(value); + const ssh = /^(?:[^@/]+@)?(\[[^\]@/]+\]|[^:/[\]]+):([^/].*)$/.exec(value); return ssh?.[1] && ssh[2] ? { host: ssh[1].toLowerCase(), diff --git a/packages/source-control-forgejo/src/server/ForgejoSourceControlProvider.test.ts b/packages/source-control-forgejo/src/server/ForgejoSourceControlProvider.test.ts index a113a722af8d7..cce3eb80d3173 100644 --- a/packages/source-control-forgejo/src/server/ForgejoSourceControlProvider.test.ts +++ b/packages/source-control-forgejo/src/server/ForgejoSourceControlProvider.test.ts @@ -1461,6 +1461,13 @@ it.effect("discovers Forgejo accounts and retains the server port", () => }), ); +it("reads SCP-style remotes on an IPv6 host like their ssh:// form", () => { + const expected = ForgejoCli.parseForgejoRemote("ssh://git@[2001:db8::1]/maria/project.git"); + for (const remote of ["git@[2001:db8::1]:maria/project.git", "[2001:db8::1]:maria/project.git"]) { + assert.deepStrictEqual(ForgejoCli.parseForgejoRemote(remote), expected); + } +}); + it.effect("does not choose a default Forgejo login across ambiguous SSH server ports", () => Effect.gen(function* () { const logins = ForgejoCli.parseForgejoLogins( diff --git a/packages/source-control-gitlab/src/server/gitLabDiscovery.test.ts b/packages/source-control-gitlab/src/server/gitLabDiscovery.test.ts index f0fdcba5aa065..cbdc023551a45 100644 --- a/packages/source-control-gitlab/src/server/gitLabDiscovery.test.ts +++ b/packages/source-control-gitlab/src/server/gitLabDiscovery.test.ts @@ -131,6 +131,18 @@ self-hosted.example.test `, exitCode: 0, }, + ...["git@[2001:db8::1]:group/project.git", "[2001:db8::1]:group/project.git"].map( + (remoteUrl) => ({ + name: `on an IPv6 host over SSH (${remoteUrl})`, + remoteUrl, + host: "[2001:db8::1]", + stdout: `[2001:db8::1] + ✓ Logged in to [2001:db8::1] as gitlab-user + ✓ Token found: ****** +`, + exitCode: 0, + }), + ), ] as const)("claims a self-hosted remote glab is signed in to $name", (scenario) => Effect.gen(function* () { const remote = parseGitRemoteHost(scenario.remoteUrl);