@devries-cameron20 / t3code Mirror · read-only / commits / d456cd77e5
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

Mirrored from https://github.com/Camo67/t3code.git

Synced Nov 22, 02:00 UTC

fix(server): respect gh Unix sockets for GitHub requests (#27733)

Co-authored-by: maria-rcks <maria@kuuro.net>

Lakshmi Tanmay committed Nov 9, 2026 at 05:09 UTC d456cd77e56b73906cd155000a276d17f70a240e
5 files changed +421 -14
packages/source-control-github/package.json
+1 -1
@@ -18,6 +18,7 @@
18 "generate": "graphqlgen"
19 },
20 "dependencies": {
21 + "@effect/platform-node": "catalog:",
22 "@t3tools/contracts": "workspace:*",
23 "@t3tools/provider-core": "workspace:*",
24 "@t3tools/shared": "workspace:*",
@@ -26,7 +27,6 @@
27 },
28 "devDependencies": {
29 "@effect/graphql-generator": "catalog:",
29 - "@effect/platform-node": "catalog:",
30 "@effect/vitest": "catalog:",
31 "@t3tools/source-control-testing": "workspace:*",
32 "@types/node": "catalog:",
packages/source-control-github/src/server/GitHubHttpClient.ts new
+84
@@ -0,0 +1,84 @@
1 +import * as NodeHttpClient from "@effect/platform-node/NodeHttpClient";
2 +import * as SourceControlHost from "@t3tools/source-control-core/server/SourceControlHost";
3 +import * as HostProcess from "@t3tools/shared/HostProcess";
4 +import * as Effect from "effect/Effect";
5 +import * as Layer from "effect/Layer";
6 +import * as Stream from "effect/Stream";
7 +import { HttpBody, HttpClient, HttpClientRequest } from "effect/http";
8 +
9 +import { GH_PROCESS_CONCURRENCY } from "./GitHubCredentials.ts";
10 +
11 +export const layer = Layer.effect(
12 + HttpClient.HttpClient,
13 + Effect.gen(function* () {
14 + const fallback = yield* HttpClient.HttpClient;
15 + const host = yield* SourceControlHost.SourceControlHost;
16 + const cwd = yield* HostProcess.WorkingDirectory;
17 + const socketPath = yield* host.process
18 + .run({
19 + operation: "GitHubHttpClient.config",
20 + command: "gh",
21 + args: ["config", "get", "http_unix_socket"],
22 + cwd,
23 + env: { GH_DEBUG: "", GH_PROMPT_DISABLED: "1" },
24 + timeoutMs: 10_000,
25 + concurrency: GH_PROCESS_CONCURRENCY,
26 + })
27 + .pipe(
28 + Effect.map((output) => output.stdout.trim()),
29 + Effect.orElseSucceed(() => ""),
30 + );
31 + if (socketPath === "") return fallback;
32 +
33 + const agent = yield* NodeHttpClient.makeAgent({ socketPath, keepAlive: false });
34 + const client = yield* NodeHttpClient.makeNodeHttp.pipe(
35 + Effect.provideService(NodeHttpClient.HttpAgent, agent),
36 + );
37 + return HttpClient.make((initialRequest, initialUrl) =>
38 + Effect.gen(function* () {
39 + let request = initialRequest;
40 + let originalUrl = initialUrl;
41 + for (let redirects = 0; ; redirects++) {
42 + const url = new URL(originalUrl);
43 + // gh sends plain HTTP over the socket while preserving the API authority.
44 + url.protocol = "http:";
45 + const response = yield* client.execute(
46 + request.pipe(
47 + HttpClientRequest.setUrl(url),
48 + HttpClientRequest.setHeader("host", originalUrl.host),
49 + ),
50 + );
51 + const location = response.headers.location;
52 + if (
53 + ![301, 302, 303, 307, 308].includes(response.status) ||
54 + !location ||
55 + redirects >= 10
56 + ) {
57 + return response;
58 + }
59 + const destination = new URL(location, originalUrl);
60 + if (destination.origin !== originalUrl.origin) {
61 + if (request.body._tag !== "Empty") return response;
62 + request = request.pipe(
63 + HttpClientRequest.removeHeader("authorization"),
64 + HttpClientRequest.removeHeader("proxy-authorization"),
65 + HttpClientRequest.removeHeader("cookie"),
66 + );
67 + }
68 + if (
69 + ((response.status === 301 || response.status === 302) && request.method === "POST") ||
70 + (response.status === 303 && request.method !== "GET" && request.method !== "HEAD")
71 + ) {
72 + request = request.pipe(
73 + HttpClientRequest.setMethod("GET"),
74 + HttpClientRequest.setBody(HttpBody.empty),
75 + );
76 + }
77 + yield* Effect.scoped(Effect.asVoid(Stream.toPull(response.stream)));
78 + request = HttpClientRequest.setUrl(request, destination);
79 + originalUrl = destination;
80 + }
81 + }),
82 + );
83 + }),
84 +);
packages/source-control-github/src/server/GitHubRest.test.ts
+313 -1
@@ -1,5 +1,14 @@
1 import { describe, expect, it } from "@effect/vitest";
2 import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
3 +import * as NodeServices from "@effect/platform-node/NodeServices";
4 +// @effect-diagnostics-next-line nodeBuiltinImport:off -- A real socket server verifies the HTTP wire format.
5 +import * as NodeHttp from "node:http";
6 +// @effect-diagnostics-next-line nodeBuiltinImport:off -- The socket fixture owns its temporary directory.
7 +import * as NodeFSP from "node:fs/promises";
8 +import * as NodeOS from "node:os";
9 +// @effect-diagnostics-next-line nodeBuiltinImport:off -- Keep the native socket path within the temporary directory.
10 +import * as NodePath from "node:path";
11 +import * as HostProcess from "@t3tools/shared/HostProcess";
12 import * as Effect from "effect/Effect";
13 import * as Layer from "effect/Layer";
14 import * as Redacted from "effect/Redacted";
@@ -7,7 +16,8 @@ import * as TestClock from "effect/testing/TestClock";
16 import * as Tracer from "effect/Tracer";
17 import { ChildProcessSpawner } from "effect/process";
18 import { VcsProcessTimeoutError } from "@t3tools/contracts";
10 -import { HttpClient, HttpClientResponse, type HttpClientRequest } from "effect/http";
19 +import { HttpClient, HttpClientResponse, HttpClientRequest } from "effect/http";
20 +import { GraphQLClient } from "effect/graphql";
21
22 import * as GitHubRest from "./GitHubRest.ts";
23 import * as GitHubRequestPolicy from "./GitHubRequestPolicy.ts";
@@ -17,6 +27,10 @@ import * as SourceControlRateLimit from "@t3tools/source-control-core/server/Sou
27 import type * as SourceControlHost from "@t3tools/source-control-core/server/SourceControlHost";
28 import * as TestSourceControlHost from "@t3tools/source-control-testing/TestSourceControlHost";
29 import * as GitHubAppSignIn from "./GitHubAppSignIn.ts";
30 +import * as GitHubHttpClient from "./GitHubHttpClient.ts";
31 +import * as GitHubGraphQlClient from "./gitHubGraphQlClient.ts";
32 +import { PullRequestBatchesGraphQLGroup } from "./pullRequestBatches.graphql.ts";
33 +import { driver } from "./driver.ts";
34
35 const appSignedOut = Layer.mock(GitHubAppSignIn.GitHubAppSignIn)({
36 enabled: false,
@@ -98,6 +112,304 @@ describe("environmentToken", () => {
112 });
113
114 describe("GitHubRest", () => {
115 + it.live("routes REST and GraphQL through gh's plain HTTP Unix socket", () =>
116 + Effect.gen(function* () {
117 + const directory = yield* Effect.acquireRelease(
118 + Effect.promise(() => NodeFSP.mkdtemp(NodePath.join(NodeOS.tmpdir(), "gh-"))),
119 + (directory) =>
120 + Effect.promise(() => NodeFSP.rm(directory, { recursive: true, force: true })),
121 + );
122 + const socketPath = NodePath.join(directory, "api.sock");
123 + const requests: Array<{
124 + method: string | undefined;
125 + path: string | undefined;
126 + headers: NodeHttp.IncomingHttpHeaders;
127 + body: string;
128 + }> = [];
129 + let redirectClosed = Promise.resolve();
130 + const server = NodeHttp.createServer(async (request, response) => {
131 + const chunks: Array<Buffer> = [];
132 + for await (const chunk of request) chunks.push(Buffer.from(chunk));
133 + const body = Buffer.concat(chunks).toString();
134 + requests.push({
135 + method: request.method,
136 + path: request.url,
137 + headers: request.headers,
138 + body,
139 + });
140 + if (request.url?.endsWith("/renamed-user")) {
141 + redirectClosed = new Promise<void>((resolve) => response.once("close", resolve));
142 + response.writeHead(301, { location: "user?per_page=1" });
143 + response.flushHeaders();
144 + return;
145 + }
146 + if (request.url === "/cross-host" || request.url === "/loop") {
147 + response.writeHead(301, {
148 + location: request.url === "/loop" ? "/loop" : "https://redirect.acme.test:8443/user",
149 + });
150 + response.end();
151 + return;
152 + }
153 + if (request.url === "/cross-post-307" || request.url === "/cross-post-308") {
154 + response.writeHead(Number(request.url.slice(-3)), {
155 + location: "https://redirect.acme.test:8443/user",
156 + });
157 + response.end();
158 + return;
159 + }
160 + if (request.url === "/post-303" || request.url === "/post-307") {
161 + response.writeHead(request.url === "/post-303" ? 303 : 307, { location: "/user" });
162 + response.end();
163 + return;
164 + }
165 + response.statusCode = request.url === "/user/starred/acme/web" ? 204 : 200;
166 + response.setHeader("content-type", "application/json");
167 + response.end(
168 + JSON.stringify(
169 + body.includes("query PullRequestByNumber")
170 + ? {
171 + data: {
172 + repository: {
173 + pullRequest: {
174 + number: 7,
175 + title: "Socket request",
176 + url: "https://github.com/acme/web/pull/7",
177 + baseRefName: "main",
178 + headRefName: "feature",
179 + headRefOid: "f".repeat(40),
180 + state: "OPEN",
181 + isDraft: false,
182 + mergedAt: null,
183 + closedAt: null,
184 + updatedAt: "2026-01-02T00:00:00Z",
185 + isCrossRepository: false,
186 + headRepository: { name: "web", nameWithOwner: "acme/web" },
187 + headRepositoryOwner: { __typename: "User", login: "acme" },
188 + },
189 + },
190 + },
191 + }
192 + : request.url?.endsWith("graphql")
193 + ? { data: { repository: { pullRequest: { additions: 3, deletions: 1 } } } }
194 + : { login: "proxy-user" },
195 + ),
196 + );
197 + });
198 + yield* Effect.acquireRelease(
199 + Effect.promise(
200 + () =>
201 + new Promise<void>((resolve, reject) => {
202 + server.once("error", reject);
203 + server.listen(socketPath, resolve);
204 + }),
205 + ),
206 + () =>
207 + Effect.promise(
208 + () =>
209 + new Promise<void>((resolve, reject) =>
210 + server.close((error) => (error ? reject(error) : resolve())),
211 + ),
212 + ),
213 + );
214 + const directRequests: Array<string> = [];
215 + const fallback = Layer.succeed(
216 + HttpClient.HttpClient,
217 + HttpClient.make((request) => {
218 + directRequests.push(request.url);
219 + return Effect.succeed(HttpClientResponse.fromWeb(request, json({}, { status: 401 })));
220 + }),
221 + );
222 + const host = TestSourceControlHost.layer({
223 + process: {
224 + run: (input) => {
225 + expect(input.command).toBe("gh");
226 + if (input.args[0] === "config") {
227 + expect(input.args).toEqual(["config", "get", "http_unix_socket"]);
228 + return Effect.succeed(TestSourceControlHost.processOutput(`${socketPath}\n`));
229 + }
230 + expect(input.args.slice(0, 2)).toEqual(["auth", "token"]);
231 + return Effect.succeed(TestSourceControlHost.processOutput("placeholder\n"));
232 + },
233 + },
234 + });
235 + const layer = GitHubRest.layerWithDependencies.pipe(
236 + Layer.provideMerge(GitHubHttpClient.layer),
237 + Layer.provide(
238 + Layer.mergeAll(
239 + host,
240 + fallback,
241 + NodeServices.layer,
242 + NodeCrypto.layer,
243 + SourceControlRateLimit.layer,
244 + ),
245 + ),
246 + );
247 + yield* Effect.gen(function* () {
248 + const rest = yield* GitHubRest.GitHubRest;
249 + const client = yield* GraphQLClient.make(
250 + PullRequestBatchesGraphQLGroup.middleware(GitHubGraphQlClient.GitHubGraphQlAuth),
251 + ).pipe(Effect.provide(GitHubGraphQlClient.layer));
252 + for (const [host, apiHost, root] of [
253 + ["github.com", "api.github.com", ""],
254 + ["git.acme.test:8443", "git.acme.test:8443", "/api/v3"],
255 + ] as const) {
256 + const answer = yield* rest.rest({
257 + host,
258 + operation: "user",
259 + path: "user?per_page=1",
260 + });
261 + expect(JSON.parse(answer.body)).toEqual({ login: "proxy-user" });
262 + const stats = yield* client
263 + .PullRequestStats({ owner: "acme", name: "web", number: 7 })
264 + .pipe(GitHubGraphQlClient.call({ host, operation: "stats" }));
265 + expect(stats).toEqual({ repository: { pullRequest: { additions: 3, deletions: 1 } } });
266 + const [restRequest, graphqlRequest] = requests.slice(-2);
267 + expect(restRequest).toMatchObject({ method: "GET", path: `${root}/user?per_page=1` });
268 + expect(graphqlRequest).toMatchObject({
269 + method: "POST",
270 + path: root === "" ? "/graphql" : "/api/graphql",
271 + });
272 + for (const request of [restRequest!, graphqlRequest!]) {
273 + expect(request.headers).toMatchObject({
274 + host: apiHost,
275 + authorization: "Bearer placeholder",
276 + "user-agent": "t3code",
277 + "x-github-api-version": "2022-11-28",
278 + });
279 + }
280 + expect(JSON.parse(graphqlRequest!.body).variables).toEqual({
281 + owner: "acme",
282 + name: "web",
283 + number: 7,
284 + });
285 + }
286 + const renamed = yield* rest.rest({
287 + host: "github.com",
288 + operation: "renamedUser",
289 + path: "renamed-user",
290 + });
291 + expect(JSON.parse(renamed.body)).toEqual({ login: "proxy-user" });
292 + yield* Effect.promise(() => redirectClosed);
293 + expect(requests.at(-1)).toMatchObject({
294 + path: "/user?per_page=1",
295 + headers: { host: "api.github.com", authorization: "Bearer placeholder" },
296 + });
297 + yield* rest.rest({ host: "github.com", operation: "redirect", path: "cross-host" });
298 + expect(requests.at(-1)?.headers.host).toBe("redirect.acme.test:8443");
299 + expect(requests.at(-1)?.headers.authorization).toBeUndefined();
300 + const loopError = yield* Effect.flip(
301 + rest.rest({ host: "github.com", operation: "redirectLoop", path: "loop" }),
302 + );
303 + expect(loopError._tag).toBe("GitHubApiResponseError");
304 + expect(requests.filter((request) => request.path === "/loop")).toHaveLength(11);
305 + const http = yield* HttpClient.HttpClient;
306 + for (const status of [303, 307]) {
307 + const response = yield* http.execute(
308 + HttpClientRequest.post(`https://api.github.com/post-${status}`).pipe(
309 + HttpClientRequest.bodyJsonUnsafe({ query: "query { viewer { login } }" }),
310 + HttpClientRequest.bearerToken("placeholder"),
311 + ),
312 + );
313 + yield* response.text;
314 + expect(requests.at(-1)).toMatchObject({
315 + method: status === 303 ? "GET" : "POST",
316 + path: "/user",
317 + body: status === 303 ? "" : JSON.stringify({ query: "query { viewer { login } }" }),
318 + });
319 + }
320 + for (const status of [307, 308]) {
321 + const before = requests.length;
322 + const response = yield* http.execute(
323 + HttpClientRequest.post(`https://api.github.com/cross-post-${status}`).pipe(
324 + HttpClientRequest.bodyJsonUnsafe({ query: "query { viewer { login } }" }),
325 + HttpClientRequest.bearerToken("placeholder"),
326 + ),
327 + );
328 + yield* response.text;
329 + expect(response.status).toBe(status);
330 + expect(requests.slice(before)).toHaveLength(1);
331 + expect(requests.at(-1)?.headers.host).toBe("api.github.com");
332 + }
333 + const instance = yield* driver.make.pipe(
334 + Effect.provide(
335 + Layer.mergeAll(
336 + host,
337 + fallback,
338 + NodeServices.layer,
339 + NodeCrypto.layer,
340 + SourceControlRateLimit.layer,
341 + ),
342 + ),
343 + );
344 + const reference = yield* instance.sourceControl.getChangeRequest({
345 + cwd: directory,
346 + reference: "https://github.com/acme/web/pull/7",
347 + });
348 + expect(reference.number).toBe(7);
349 + expect(requests.at(-1)?.body).toContain("query PullRequestByNumber");
350 + expect(yield* instance.isRepositoryStarred!("github.com", "acme/web")).toBe(true);
351 + expect(requests.at(-1)?.path).toBe("/user/starred/acme/web");
352 + yield* Effect.promise(() => NodeFSP.unlink(socketPath));
353 + const error = yield* Effect.flip(
354 + rest.rest({ host: "github.com", operation: "user", path: "user" }),
355 + );
356 + expect(error._tag).toBe("GitHubApiRequestError");
357 + expect(directRequests).toEqual([]);
358 + const mediaUrl = "https://objects.githubusercontent.com/proof.png";
359 + const media = yield* instance.fetchMedia!({ url: mediaUrl, headers: {} });
360 + expect(media?.status).toBe(401);
361 + expect(directRequests).toEqual([mediaUrl]);
362 + }).pipe(Effect.provide(layer), Effect.provideService(HostProcess.Environment, {}));
363 + }).pipe(Effect.scoped),
364 + );
365 +
366 + it.effect.each(["", "unavailable"])(
367 + "keeps the existing HTTP client when gh's socket is %s",
368 + (config) => {
369 + const requests: Array<HttpClientRequest.HttpClientRequest> = [];
370 + const fallback = Layer.succeed(
371 + HttpClient.HttpClient,
372 + HttpClient.make((request) => {
373 + requests.push(request);
374 + return Effect.succeed(
375 + HttpClientResponse.fromWeb(request, json({ login: "direct-user" })),
376 + );
377 + }),
378 + );
379 + const host = TestSourceControlHost.layer({
380 + process: {
381 + run: () =>
382 + config === ""
383 + ? Effect.succeed(TestSourceControlHost.processOutput("\n"))
384 + : Effect.fail(
385 + new VcsProcessTimeoutError({
386 + operation: "GitHubHttpClient.config",
387 + command: "gh",
388 + cwd: "/",
389 + timeoutMs: 10_000,
390 + }),
391 + ),
392 + },
393 + });
394 + return Effect.gen(function* () {
395 + const api = yield* HttpClient.HttpClient;
396 + const answer = yield* api.execute(
397 + HttpClientRequest.get("https://api.github.com/user").pipe(
398 + HttpClientRequest.bearerToken("first"),
399 + ),
400 + );
401 + expect(yield* answer.json).toEqual({ login: "direct-user" });
402 + expect(requests).toHaveLength(1);
403 + expect(requests[0]).toMatchObject({
404 + url: "https://api.github.com/user",
405 + headers: { authorization: "Bearer first" },
406 + });
407 + }).pipe(
408 + Effect.provide(GitHubHttpClient.layer.pipe(Layer.provide(Layer.merge(host, fallback)))),
409 + );
410 + },
411 + );
412 +
413 it.effect("traces the operation, path and quota, never the query string or the token", () => {
414 const spans: Array<Tracer.NativeSpan> = [];
415 const tracer = Tracer.make({
packages/source-control-github/src/server/driver.ts
+20 -9
@@ -6,6 +6,7 @@ import {
6 } from "@t3tools/source-control-core/server/driver";
7 import * as Effect from "effect/Effect";
8 import * as Layer from "effect/Layer";
9 +import { HttpClient } from "effect/http";
10
11 import { definition } from "../shared/definition.ts";
12
@@ -15,6 +16,7 @@ import * as GitHubMediaFetch from "./gitHubMediaFetch.ts";
16 import * as GitHubPullRequestApi from "./GitHubPullRequestApi.ts";
17 import * as GitHubPullRequestProvider from "./GitHubPullRequestProvider.ts";
18 import * as GitHubRest from "./GitHubRest.ts";
19 +import * as GitHubHttpClient from "./GitHubHttpClient.ts";
20 import * as GitHubSourceControlProvider from "./GitHubSourceControlProvider.ts";
21
22 // `GitHubRest.layerWithDependencies` carries the quota reserve every GitHub reader shares, so it
@@ -22,6 +24,7 @@ import * as GitHubSourceControlProvider from "./GitHubSourceControlProvider.ts";
24 const services = GitHubPullRequestApi.layer.pipe(
25 Layer.provideMerge(GitHubAppAccess.layer),
26 Layer.provideMerge(GitHubRest.layerWithDependencies),
27 + Layer.provideMerge(GitHubHttpClient.layer),
28 );
29
30 const makeSignIn = Effect.gen(function* () {
@@ -94,18 +97,26 @@ export const makeStarRepository = Effect.gen(function* () {
97 );
98 });
99
97 -const makeInstance = Effect.all({
98 - sourceControl: GitHubSourceControlProvider.make,
99 - discovery: GitHubSourceControlProvider.makeDiscovery,
100 - pullRequests: GitHubPullRequestProvider.make,
101 - fetchMedia: GitHubMediaFetch.make,
102 - signIn: makeSignIn,
103 - isRepositoryStarred: makeIsRepositoryStarred,
104 - starRepository: makeStarRepository,
100 +const makeInstance = Effect.gen(function* () {
101 + const mediaHttpClient = yield* HttpClient.HttpClient;
102 + return yield* withOwnServices(
103 + Effect.all({
104 + sourceControl: GitHubSourceControlProvider.make,
105 + discovery: GitHubSourceControlProvider.makeDiscovery,
106 + pullRequests: GitHubPullRequestProvider.make,
107 + fetchMedia: GitHubMediaFetch.make.pipe(
108 + Effect.provideService(HttpClient.HttpClient, mediaHttpClient),
109 + ),
110 + signIn: makeSignIn,
111 + isRepositoryStarred: makeIsRepositoryStarred,
112 + starRepository: makeStarRepository,
113 + }),
114 + services,
115 + );
116 });
117
118 export const driver = defineSourceControlDriver({
119 kind: definition.kind,
120 definition,
110 - make: withOwnServices(makeInstance, services),
121 + make: makeInstance,
122 });
pnpm-lock.yaml
+3 -3
@@ -2295,6 +2295,9 @@ importers:
2295
2296 packages/source-control-github:
2297 dependencies:
2298 + '@effect/platform-node':
2299 + specifier: 4.1.2
2300 + version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
2301 '@t3tools/contracts':
2302 specifier: workspace:*
2303 version: link:../contracts
@@ -2314,9 +2317,6 @@ importers:
2317 '@effect/graphql-generator':
2318 specifier: 'catalog:'
2319 version: 4.1.2(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(effect@4.1.2)
2317 - '@effect/platform-node':
2318 - specifier: 4.1.2
2319 - version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
2320 '@effect/vitest':
2321 specifier: 4.1.2
2322 version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)