Skip to content

fix: accept GitHub HTTPS remotes with a username or token #9138

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
alexnault wants to merge 6 commits into
base: main
Choose a base branch
from
Open

fix: accept GitHub HTTPS remotes with a username or token #9138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
32dc9a5
fix: accept GitHub HTTPS remotes with userinfo
alexnault Oct 30, 2026
812ef73
Update packages/shared/src/github-remote.ts
alexnault Oct 31, 2026
6d2e6db
Merge remote-tracking branch 'origin/main' into alex/fix-github-remot…
alexnault Oct 31, 2026
ec76cba
Merge remote-tracking branch 'fork/alex/fix-github-remote-user-6eb038…
alexnault Oct 31, 2026
3e73cdc
fix: stop GitHub remote userinfo at the URL authority in desktop parsers
alexnault Oct 31, 2026
1f8ff67
fix: reject URL delimiters in GitHub owner and repo captures
alexnault Oct 31, 2026
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
6 changes: 6 additions & 0 deletions apps/desktop/src/lib/trpc/routers/changes/utils/pull-request-url.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ describe("pull-request-url", () => {
expect(
normalizeGitHubRepoUrl("ssh://git@github.com/Kitenite/superset.git"),
).toBe("https://github.com/Kitenite/superset");
expect(
normalizeGitHubRepoUrl("https://someone:ghp_x@github.com/acme/foo.git"),
).toBe("https://github.com/acme/foo");
expect(
normalizeGitHubRepoUrl("https://example.com?next=@github.com/acme/foo"),
).toBeNull();
});

test("parses upstream refs with slashes in branch names", () => {
Expand Down
2 changes: 1 addition & 1 deletion apps/desktop/src/lib/trpc/routers/changes/utils/pull-request-url.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export function normalizeGitHubRepoUrl(remoteUrl: string): string | null {
const match = [
/^git@github\.com:(?<owner>[^/]+)\/(?<repo>[^/]+?)(?:\.git)?$/,
/^ssh:\/\/git@github\.com\/(?<owner>[^/]+)\/(?<repo>[^/]+?)(?:\.git)?$/,
/^https:\/\/github\.com\/(?<owner>[^/]+)\/(?<repo>[^/]+?)(?:\.git)?\/?$/,
/^https:\/\/(?:[^@/?#\\]+@)?github\.com\/(?<owner>[^/?#\\]+)\/(?<repo>[^/?#\\]+?)(?:\.git)?\/?$/,
]
.map((pattern) => pattern.exec(trimmedRemoteUrl))
.find((result) => result?.groups?.owner && result.groups.repo);
Expand Down
2 changes: 1 addition & 1 deletion apps/desktop/src/lib/trpc/routers/workspaces/utils/github/repo-context.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ export function normalizeGitHubUrl(remoteUrl: string): string | null {
const patterns = [
/^git@github\.com:(?<nwo>[^/]+\/[^/]+?)(?:\.git)?$/,
/^ssh:\/\/git@github\.com\/(?<nwo>[^/]+\/[^/]+?)(?:\.git)?$/,
/^https:\/\/github\.com\/(?<nwo>[^/]+\/[^/]+?)(?:\.git)?\/?$/,
/^https:\/\/(?:[^@/?#\\]+@)?github\.com\/(?<nwo>[^/?#\\]+\/[^/?#\\]+?)(?:\.git)?\/?$/,
];
for (const pattern of patterns) {
const match = pattern.exec(trimmed);
Expand Down
30 changes: 30 additions & 0 deletions packages/shared/src/github-remote.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import { describe, expect, test } from "bun:test";
import { parseGitHubRemote } from "./github-remote";

describe("parseGitHubRemote", () => {
test("accepts HTTPS remotes with userinfo and drops it from the URL", () => {
for (const url of [
"https://someone@github.com/acme/foo.git",
"https://someone:ghp_x@github.com/acme/foo",
]) {
expect(parseGitHubRemote(url)).toEqual({
provider: "github",
owner: "acme",
name: "foo",
url: "https://github.com/acme/foo",
});
}
});

test("rejects HTTPS remotes with a query, fragment, or backslash", () => {
for (const url of [
"https://example.com?next=@github.com/acme/foo.git",
"https://example.com#@github.com/acme/foo",
"https://example.com\\@github.com/acme/foo",
"https://github.com/acme?next/foo",
"https://github.com/acme/foo#bar",
]) {
expect(parseGitHubRemote(url)).toBeNull();
}
});
});
2 changes: 1 addition & 1 deletion packages/shared/src/github-remote.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export function parseGitHubRemote(
const patterns = [
/^git@github\.com:(?<owner>[^/]+)\/(?<name>[^/]+?)(?:\.git)?$/,
/^ssh:\/\/git@github\.com\/(?<owner>[^/]+)\/(?<name>[^/]+?)(?:\.git)?$/,
/^https:\/\/github\.com\/(?<owner>[^/]+)\/(?<name>[^/]+?)(?:\.git)?\/?$/,
/^https:\/\/(?:[^@/?#\\]+@)?github\.com\/(?<owner>[^/?#\\]+)\/(?<name>[^/?#\\]+?)(?:\.git)?\/?$/,
];

for (const pattern of patterns) {
Expand Down
Loading