@devries-cameron20 / t3code Mirror · read-only / commits / c57ccdaf52
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 21, 04:45 UTC

fix(server): signed URLs stay out of HTTP request logs (#39464)

Julius Marminge committed Nov 19, 2026 at 17:43 UTC c57ccdaf522fdbc9596d7a3ace6e531e3d73400f
3 files changed +45 -12
apps/server/src/http.test.ts
+23 -4
@@ -10,14 +10,17 @@ import * as Effect from "effect/Effect";
10 import * as Fiber from "effect/Fiber";
11 import * as FileSystem from "effect/FileSystem";
12 import * as Layer from "effect/Layer";
13 +import * as Logger from "effect/Logger";
14 import * as Path from "effect/Path";
15 import * as PlatformError from "effect/PlatformError";
16 import * as Queue from "effect/Queue";
17 +import * as References from "effect/References";
18 import * as Tracer from "effect/Tracer";
19 import { HttpClient, HttpClientRequest, HttpRouter, HttpServerResponse } from "effect/http";
20 import { ASSET_ROUTE_PREFIX } from "./assets/AssetAccess.ts";
21 import { ATTACHMENT_UPLOAD_ROUTE_PREFIX } from "./assets/AttachmentUpload.ts";
22 import { openMediaFile } from "./assets/MediaFile.ts";
23 +import { WEBHOOK_ROUTE_PREFIX } from "./scheduledTasks/ScheduledTaskService.ts";
24
25 import {
26 injectMcpAppCsp,
@@ -177,9 +180,10 @@ describe("browser API CORS", () => {
180 });
181
182 describe("untraced requests", () => {
180 - it.effect("keeps signed asset and upload URLs out of HTTP server spans", () =>
183 + it.effect("keeps signed URLs out of HTTP server spans and request logs", () =>
184 Effect.gen(function* () {
185 const serverSpans: Array<string> = [];
186 + const loggedUrls: Array<unknown> = [];
187 const layerTracer = Layer.succeed(
188 Tracer.Tracer,
189 Tracer.make({
@@ -189,6 +193,15 @@ describe("untraced requests", () => {
193 },
194 }),
195 );
196 + const layerLogger = Logger.layer(
197 + [
198 + Logger.make(({ fiber }) => {
199 + const url = fiber.getRef(References.CurrentLogAnnotations)["http.url"];
200 + if (url !== undefined) loggedUrls.push(url);
201 + }),
202 + ],
203 + { mergeWithExisting: false },
204 + );
205 const layerRoutes = Layer.effectDiscard(
206 Effect.gen(function* () {
207 const router = yield* HttpRouter.HttpRouter;
@@ -198,32 +211,37 @@ describe("untraced requests", () => {
211 `${ATTACHMENT_UPLOAD_ROUTE_PREFIX}/*`,
212 HttpServerResponse.empty(),
213 );
214 + yield* router.add("POST", `${WEBHOOK_ROUTE_PREFIX}/*`, HttpServerResponse.empty());
215 yield* router.add("GET", "/api/environment", HttpServerResponse.empty());
216 }),
203 - );
217 + ).pipe(Layer.provide(ServerHttp.layerUnloggedSignedRequests));
218 const services = yield* Layer.build(
205 - HttpRouter.serve(layerRoutes, { disableListenLog: true, disableLogger: true }).pipe(
219 + HttpRouter.serve(layerRoutes, { disableListenLog: true }).pipe(
220 ServerHttp.withUntracedRequests,
221 Layer.provideMerge(NodeHttpServer.layerTest),
222 Layer.provide(layerTracer),
223 + Layer.provide(layerLogger),
224 ),
225 );
226 const client = Context.get(services, HttpClient.HttpClient);
227
213 - // Each URL is a bearer credential: url.full and url.path would carry it.
228 + // Each URL is a bearer credential: url.full, url.path and http.url would carry it.
229 for (const request of [
230 HttpClientRequest.get(`${ASSET_ROUTE_PREFIX}/payload.signature/image.png`),
231 HttpClientRequest.get(`${ASSET_ROUTE_PREFIX}/payload.signature/image.png?v=1`),
232 HttpClientRequest.post(`${ATTACHMENT_UPLOAD_ROUTE_PREFIX}/payload.signature`),
233 HttpClientRequest.post(`${ATTACHMENT_UPLOAD_ROUTE_PREFIX}/payload.signature?v=1`),
234 + HttpClientRequest.post(`${WEBHOOK_ROUTE_PREFIX}/task-1/webhook-token`),
235 HttpClientRequest.head(`${ASSET_ROUTE_PREFIX}/payload.signature/image.png`),
236 ]) {
237 expect((yield* client.execute(request)).status).toBe(204);
238 }
239 expect(serverSpans).toEqual([]);
240 + expect(loggedUrls).toEqual([]);
241
242 expect((yield* client.execute(HttpClientRequest.get("/api/environment"))).status).toBe(204);
243 expect(serverSpans).toEqual(["GET"]);
244 + expect(loggedUrls).toEqual(["/api/environment"]);
245
246 for (const path of [
247 `${ASSET_ROUTE_PREFIX}-other/file`,
@@ -232,6 +250,7 @@ describe("untraced requests", () => {
250 expect((yield* client.execute(HttpClientRequest.get(path))).status).toBe(404);
251 }
252 expect(serverSpans).toEqual(["GET", "GET", "GET"]);
253 + expect(loggedUrls).toHaveLength(3);
254 }).pipe(Effect.provide(NodeServices.layer)),
255 );
256
apps/server/src/http.ts
+21 -8
@@ -417,20 +417,33 @@ export const layerOtlpTracesProxyRoute = HttpRouter.add(
417 ),
418 );
419
420 -const UNTRACED_REQUEST_PATHS: ReadonlySet<string> = new Set([OTLP_TRACES_PROXY_PATH]);
421 -
422 -// HttpRouter.serve builds routes privately; provide the server-wide TracerDisabledWhen to the served layer.
423 -const layerUntracedRequests = Layer.succeed(HttpMiddleware.TracerDisabledWhen)((request) => {
420 +const requestPath = (request: HttpServerRequest.HttpServerRequest) => {
421 const queryIndex = request.url.indexOf("?");
425 - const path = queryIndex === -1 ? request.url : request.url.slice(0, queryIndex);
426 - // Signed URLs carry bearer tokens in the path, so they never reach a trace.
422 + return queryIndex === -1 ? request.url : request.url.slice(0, queryIndex);
423 +};
424 +
425 +// Signed URLs carry bearer tokens in the path, which URL param redaction cannot reach.
426 +const isSignedUrlRequest = (request: HttpServerRequest.HttpServerRequest) => {
427 + const path = requestPath(request);
428 return (
428 - UNTRACED_REQUEST_PATHS.has(path) ||
429 path.startsWith(`${WEBHOOK_ROUTE_PREFIX}/`) ||
430 path.startsWith(`${ASSET_ROUTE_PREFIX}/`) ||
431 path.startsWith(`${ATTACHMENT_UPLOAD_ROUTE_PREFIX}/`)
432 );
433 -});
433 +};
434 +
435 +// HttpRouter.serve builds routes privately; provide the server-wide TracerDisabledWhen to the served layer.
436 +const layerUntracedRequests = Layer.succeed(HttpMiddleware.TracerDisabledWhen)(
437 + (request) => requestPath(request) === OTLP_TRACES_PROXY_PATH || isSignedUrlRequest(request),
438 +);
439 +
440 +export const layerUnloggedSignedRequests = HttpRouter.middleware(
441 + (httpEffect) =>
442 + Effect.flatMap(HttpServerRequest.HttpServerRequest, (request) =>
443 + isSignedUrlRequest(request) ? HttpMiddleware.withLoggerDisabled(httpEffect) : httpEffect,
444 + ),
445 + { global: true },
446 +);
447
448 export const withUntracedRequests = Layer.provide(layerUntracedRequests);
449
apps/server/src/server.ts
+1
@@ -910,6 +910,7 @@ const layerMakeRoutes = Layer.mergeAll(
910 Layer.provide(layerCommandReadiness),
911 Layer.provide(ServerHttp.layerBrowserApiCors),
912 Layer.provide(ServerHttp.layerHttpCompression),
913 + Layer.provide(ServerHttp.layerUnloggedSignedRequests),
914 );
915
916 const layerMakeServer = Layer.unwrap(