Fix git SSH URL parsing (#567)

Closes #566. ## Test plan CI passes.
sourcegraph · Aug 4, 2023 · 648adac · 648adac
1 parent 91f1df0
commit 648adac
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/vscode/src/chat/utils.test.ts b/vscode/src/chat/utils.test.ts
@@ -16,6 +16,12 @@ describe('convertGitCloneURLToCodebaseName', () => {
         )
     })
 
+    test('converts SSH URL with custom user@', () => {
+        expect(convertGitCloneURLToCodebaseName('[email protected]:sourcegraph/sourcegraph')).toEqual(
+            'github.com/sourcegraph/sourcegraph'
+        )
+    })
+
     test('converts GitHub HTTPS URL', () => {
         expect(convertGitCloneURLToCodebaseName('https://github.com/sourcegraph/sourcegraph')).toEqual(
             'github.com/sourcegraph/sourcegraph'

diff --git a/vscode/src/chat/utils.ts b/vscode/src/chat/utils.ts
@@ -11,15 +11,16 @@ export function convertGitCloneURLToCodebaseName(cloneURL: string): string | nul
         return null
     }
     try {
-        const uri = new URL(cloneURL.replace('git@', ''))
         // Handle common Git SSH URL format
-        const match = cloneURL.match(/git@([^:]+):([\w-]+)\/([\w-]+)(\.git)?/)
-        if (cloneURL.startsWith('git@') && match) {
+        const match = cloneURL.match(/^[\w-]+@([^:]+):([\w-]+)\/([\w-]+)(\.git)?$/)
+        if (match) {
             const host = match[1]
             const owner = match[2]
             const repo = match[3]
             return `${host}/${owner}/${repo}`
         }
+
+        const uri = new URL(cloneURL)
         // Handle GitHub URLs
         if (uri.protocol.startsWith('github') || uri.href.startsWith('github')) {
             return `github.com/${uri.pathname.replace('.git', '')}`