Skip to content

Commit b58ff82

Browse files
committed
fix(source-control): resolve Forgejo SSH web authorities
1 parent 8f7a445 commit b58ff82

9 files changed

Lines changed: 89 additions & 35 deletions

File tree

‎apps/server/src/pullRequest/PullRequestService.test.ts‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1672,8 +1672,8 @@ it.effect("routes explicit Forgejo HTTP authorities through SSH checkouts after
16721672
workspaceRoot: "/ssh",
16731673
repository: "team/repo",
16741674
provider,
1675-
host: "code.example",
1676-
remoteUrl: "[email protected]:team/repo.git",
1675+
host: "ssh.code.example",
1676+
remoteUrl: "git@ssh.code.example:team/repo.git",
16771677
}),
16781678
],
16791679
providers: [
@@ -1685,11 +1685,19 @@ it.effect("routes explicit Forgejo HTTP authorities through SSH checkouts after
16851685
}),
16861686
}),
16871687
],
1688-
resolveHandle: ({ context }) =>
1689-
Effect.succeed({
1690-
context: { ...context!, provider: { ...context!.provider, kind: "forgejo" } },
1688+
resolveHandle: ({ context }) => {
1689+
if (context?.requestedHost === undefined) {
1690+
return Effect.succeed({ context: context!, provider: undefined as never });
1691+
}
1692+
assert.strictEqual(context.requestedHost, "code.example:3000");
1693+
return Effect.succeed({
1694+
context: {
1695+
...context,
1696+
provider: { kind: "forgejo", name: "Forgejo", baseUrl: "http://code.example:3000" },
1697+
},
16911698
provider: undefined as never,
1692-
}),
1699+
});
1700+
},
16931701
});
16941702
yield* service.summary(
16951703
{

‎apps/server/src/pullRequest/PullRequestService.ts‎

Lines changed: 31 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,8 @@ export const make = Effect.gen(function* () {
554554
if (filter.projectId !== undefined && project.id !== filter.projectId) continue;
555555
const identity = project.repositoryIdentity;
556556
if (
557-
identity?.provider !== "unknown" ||
557+
(identity?.provider !== "unknown" &&
558+
!(identity?.provider === "forgejo" && isSshRemoteUrl(identity.locator.remoteUrl))) ||
558559
sourceControlRepositorySelector(project.repositoryIdentity) === null
559560
)
560561
continue;
@@ -566,10 +567,7 @@ export const make = Effect.gen(function* () {
566567
host !== "unknown" &&
567568
host !== filter.host.toLowerCase() &&
568569
pullRequestHostOf(identity, "forgejo") !== filter.host.toLowerCase() &&
569-
!(
570-
isSshRemoteUrl(identity.locator.remoteUrl) &&
571-
host === filter.host.toLowerCase().replace(/:\d+$/u, "")
572-
)
570+
!isSshRemoteUrl(identity.locator.remoteUrl)
573571
) {
574572
continue;
575573
}
@@ -591,20 +589,28 @@ export const make = Effect.gen(function* () {
591589
Effect.suspend(() =>
592590
sourceControlProviders.resolveHandle({
593591
cwd: project.workspaceRoot,
594-
context: { provider, remoteName, remoteUrl },
592+
context: {
593+
provider:
594+
provider.kind === "forgejo" ? { ...provider, kind: "unknown" } : provider,
595+
remoteName,
596+
remoteUrl,
597+
...(filter.host !== undefined && isSshRemoteUrl(remoteUrl)
598+
? { requestedHost: filter.host }
599+
: {}),
600+
},
595601
}),
596602
).pipe(
597603
Effect.flatMap((handle) => {
598-
const kind = handle.context?.provider.kind;
599-
return kind === undefined || kind === "unknown"
604+
const refined = handle.context?.provider;
605+
return refined === undefined || refined.kind === "unknown"
600606
? Effect.fail(undefined)
601-
: Effect.succeed(kind);
607+
: Effect.succeed(refined);
602608
}),
603609
),
604610
),
605611
).pipe(
606-
Effect.map((kind) => [baseUrl, kind] as const),
607-
Effect.orElseSucceed(() => [baseUrl, "unknown"] as const),
612+
Effect.map((provider) => [baseUrl, provider] as const),
613+
Effect.orElseSucceed(() => [baseUrl, null] as const),
608614
),
609615
{ concurrency: REPOSITORY_CONCURRENCY },
610616
).pipe(Effect.map((resolved) => new Map(resolved)));
@@ -624,10 +630,10 @@ export const make = Effect.gen(function* () {
624630
),
625631
Effect.flatMap((snapshot) =>
626632
refineUnknownProjectKinds(snapshot.projects, filter).pipe(
627-
Effect.map((refinedKinds) => ({ refinedKinds, snapshot })),
633+
Effect.map((refinedProviders) => ({ refinedProviders, snapshot })),
628634
),
629635
),
630-
Effect.map(({ refinedKinds, snapshot }) => {
636+
Effect.map(({ refinedProviders, snapshot }) => {
631637
const supported: SupportedProject[] = [];
632638
const unimplemented = new Map<
633639
string,
@@ -645,21 +651,21 @@ export const make = Effect.gen(function* () {
645651
// Worktrees of one repository are separate projects; reading the remote once keeps
646652
// the page from repeating every change request per local checkout. The host is part
647653
// of the key, so the same `owner/repo` on two hosts stays two repositories.
648-
if (kind === "unknown") {
654+
let refinedProvider: SourceControlProviderInfo | null | undefined;
655+
if (
656+
kind === "unknown" ||
657+
(kind === "forgejo" && isSshRemoteUrl(identity.locator.remoteUrl))
658+
) {
649659
const provider = detectSourceControlProviderFromRemoteUrl(identity.locator.remoteUrl);
650-
kind = provider === null ? kind : (refinedKinds.get(provider.baseUrl) ?? kind);
660+
refinedProvider = provider === null ? null : refinedProviders.get(provider.baseUrl);
661+
kind = refinedProvider?.kind ?? kind;
651662
}
652-
let host = pullRequestHostOf(identity, kind);
663+
const host =
664+
refinedProvider?.kind === "forgejo"
665+
? new URL(refinedProvider.baseUrl).host.toLowerCase()
666+
: pullRequestHostOf(identity, kind);
653667
if (filter.host !== undefined && host !== filter.host.toLowerCase()) {
654-
if (
655-
kind !== "forgejo" ||
656-
!isSshRemoteUrl(identity.locator.remoteUrl) ||
657-
host !== filter.host.toLowerCase().replace(/:\d+$/u, "")
658-
) {
659-
continue;
660-
}
661-
// SSH clone ports do not identify the web server; tea validates this HTTP authority.
662-
host = filter.host.toLowerCase();
668+
continue;
663669
}
664670
const api = registry.get(kind);
665671
// Recorded before the de-duplication below, so the viewer lookup keeps the alternates

‎apps/server/src/sourceControl/ForgejoCli.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,12 @@ export function parseForgejoRemote(value: string) {
109109
export function matchForgejoLogin(
110110
logins: ReturnType<typeof parseForgejoLogins>,
111111
remote: NonNullable<ReturnType<typeof parseForgejoRemote>>,
112+
requestedHost?: string,
112113
) {
113114
const matches = logins.filter((login) => {
114115
const url = parseForgejoRemote(login.url);
115116
if (!url) return false;
117+
if (requestedHost !== undefined && url.host !== requestedHost.toLowerCase()) return false;
116118
return remote.ssh
117119
? login.ssh_host?.toLowerCase() === remote.hostname || url.hostname === remote.hostname
118120
: url.host === remote.host &&
@@ -192,6 +194,7 @@ export const make = Effect.gen(function* () {
192194
}
193195
if (
194196
input.host &&
197+
!remote?.ssh &&
195198
remote?.host !== input.host.toLowerCase() &&
196199
remote?.hostname !== input.host.toLowerCase()
197200
)
@@ -202,7 +205,7 @@ export const make = Effect.gen(function* () {
202205
path: remote?.path ?? "",
203206
};
204207
const login = remote
205-
? matchForgejoLogin(logins, remote)
208+
? matchForgejoLogin(logins, remote, remote.ssh ? input.host : undefined)
206209
: (logins.find((item) => item.default === "true") ??
207210
(logins.length === 1 ? logins[0] : undefined));
208211
if (!login)

‎apps/server/src/sourceControl/ForgejoSourceControlProvider.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,11 @@ export const discovery = {
3939
const remote = ForgejoCli.parseForgejoRemote(input.context.remoteUrl);
4040
const login =
4141
remote &&
42-
ForgejoCli.matchForgejoLogin(ForgejoCli.parseForgejoLogins(input.auth.stdout), remote);
42+
ForgejoCli.matchForgejoLogin(
43+
ForgejoCli.parseForgejoLogins(input.auth.stdout),
44+
remote,
45+
input.context.requestedHost,
46+
);
4347
return login ? { kind: "forgejo", name: "Forgejo / Gitea", baseUrl: login.url } : null;
4448
},
4549
installHint:

‎apps/server/src/sourceControl/SourceControlDiscovery.test.ts‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -413,6 +413,25 @@ it.effect("does not choose a default Forgejo login across ambiguous SSH server p
413413
remote,
414414
);
415415
assert.isUndefined(ForgejoCli.matchForgejoLogin(logins, remote!));
416+
assert.strictEqual(
417+
ForgejoCli.matchForgejoLogin(logins, remote!, "forgejo.local:4000")?.name,
418+
"two",
419+
);
420+
assert.isUndefined(ForgejoCli.matchForgejoLogin(logins, remote!, "other.local:4000"));
421+
const alias = ForgejoCli.parseForgejoRemote("[email protected]:maria/project.git");
422+
assert.isNotNull(alias);
423+
assert.isUndefined(ForgejoCli.matchForgejoLogin(logins, alias!, "forgejo.local:4000"));
424+
const refined = ForgejoSourceControlProvider.discovery.refineUnknownRemote({
425+
cwd: "/repo",
426+
context: {
427+
provider: { kind: "unknown", name: "Forgejo", baseUrl: "https://forgejo.local" },
428+
remoteName: "origin",
429+
remoteUrl: "[email protected]:maria/project.git",
430+
requestedHost: "forgejo.local:4000",
431+
},
432+
auth: processOutput(yield* encodeJsonEffect(logins)),
433+
});
434+
assert.strictEqual(refined?.baseUrl, "http://forgejo.local:4000");
416435
const https = ForgejoCli.parseForgejoRemote("http://forgejo.local:4000/maria/project.git");
417436
assert.isNotNull(https);
418437
assert.strictEqual(ForgejoCli.matchForgejoLogin(logins, https!)?.name, "two");

‎apps/server/src/sourceControl/SourceControlProvider.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ export interface SourceControlProviderContext {
1414
readonly provider: SourceControlProviderInfo;
1515
readonly remoteName: string;
1616
readonly remoteUrl: string;
17+
/** An explicit web authority can disambiguate Forgejo logins sharing an SSH alias. */
18+
readonly requestedHost?: string;
1719
}
1820

1921
export interface SourceControlRefSelector {

‎apps/web/src/components/pullRequest/PullRequestThreadLinks.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,10 @@ function EnabledPullRequestThreadLinks({
8989
}
9090
if (linking.mode === "multiple") {
9191
appAtomRegistry.refresh(
92-
pullRequestEnvironment.linkedThreads({ environmentId, input: { ...reference, ...parsed } }),
92+
pullRequestEnvironment.linkedThreads({
93+
environmentId,
94+
input: { ...reference, ...normalizeThreadPullRequestKey(parsed) },
95+
}),
9396
);
9497
}
9598
onPickerOpenChange?.(false);

‎apps/web/src/lib/openPullRequestLink.test.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,15 @@ describe("matchesLinkedPullRequestUrl", () => {
192192
).toBe(true);
193193
});
194194

195+
it("keeps Forgejo and GitHub path shapes distinct on a GitHub-named host", () => {
196+
expect(
197+
matchesLinkedPullRequestUrl(
198+
{ ...linkedPullRequest, url: "https://github.internal/team/repo/pulls/42" },
199+
"https://github.internal/team/repo/pull/42",
200+
),
201+
).toBe(false);
202+
});
203+
195204
it("rejects a different pull request or host", () => {
196205
expect(
197206
matchesLinkedPullRequestUrl(linkedPullRequest, "https://github.com/pingdotgg/t3code/pull/43"),

‎packages/shared/src/changeRequestUrl.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ export function matchesLinkedPullRequestUrl(
199199
linked.host === target.host &&
200200
linked.repository === target.repository &&
201201
linked.number === target.number &&
202-
(target.authority === undefined || linked.authority === target.authority)
202+
linked.authority === target.authority
203203
);
204204
}
205205

0 commit comments

Comments
 (0)