@devries-cameron20 / t3code-1 / commits / 39fcae5267
Fork 0

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

fix(server): session cookies are Secure when the request arrived over HTTPS (#37042)

Julius Marminge committed Nov 14, 2026 at 20:34 UTC 39fcae5267a4a85b637f3e6235641fbfb0c7881e
2 files changed +40 -13
apps/server/src/auth/http.test.ts
+12
@@ -125,6 +125,18 @@ it.effect("sets the selected browser session cookies through the HTTP route", ()
125 expect(devCookies).toContainEqual(
126 expect.stringMatching(/^t3_session_[^=]*=;.*Max-Age=0/),
127 );
128 + expect(devCookies.filter((cookie) => /;\s*Secure/i.test(cookie))).toEqual([]);
129 + const httpsResponse = await environmentA.handler(
130 + postJson(
131 + "/api/auth/browser-session",
132 + { credential: DEV_TOKEN },
133 + { "x-forwarded-proto": "https" },
134 + ),
135 + requestContext,
136 + );
137 + const httpsCookies = httpsResponse.headers.getSetCookie();
138 + expect(httpsCookies).toHaveLength(2);
139 + for (const cookie of httpsCookies) expect(cookie).toMatch(/;\s*Secure/i);
140 const devCookieHeader = devCookie?.split(";", 1)[0] ?? "";
141 const environmentBSession = await environmentB.handler(
142 new Request("http://127.0.0.1/api/auth/session", {
apps/server/src/auth/http.ts
+28 -13
@@ -26,6 +26,7 @@ import { causeErrorTag } from "@t3tools/shared/observability";
26 import * as Clock from "effect/Clock";
27 import * as DateTime from "effect/DateTime";
28 import * as Effect from "effect/Effect";
29 +import * as Option from "effect/Option";
30 import * as Schema from "effect/Schema";
31 import * as Layer from "effect/Layer";
32 import * as Cookies from "effect/http/Cookies";
@@ -201,13 +202,24 @@ export const failEnvironmentInternal =
202 return yield* new EnvironmentInternalError({ code: "internal_error", reason, traceId });
203 });
204
204 -const appendSessionCookie = (cookieName: string, token: string, expiresAt: DateTime.DateTime) =>
205 +// Plaintext LAN servers still need the cookie; TLS arrives through a proxy that sets X-Forwarded-Proto.
206 +const sessionCookieOptions = (request: HttpServerRequest.HttpServerRequest) => ({
207 + httpOnly: true,
208 + path: "/",
209 + sameSite: "lax" as const,
210 + secure: Option.exists(requestUrl(request), (url) => url.protocol === "https:"),
211 +});
212 +
213 +const appendSessionCookie = (
214 + request: HttpServerRequest.HttpServerRequest,
215 + cookieName: string,
216 + token: string,
217 + expiresAt: DateTime.DateTime,
218 +) =>
219 Effect.fromResult(
220 Cookies.set(Cookies.empty, cookieName, token, {
221 + ...sessionCookieOptions(request),
222 expires: DateTime.toDate(expiresAt),
208 - httpOnly: true,
209 - path: "/",
210 - sameSite: "lax",
223 }),
224 ).pipe(
225 Effect.catch(() => failEnvironmentInternal("browser_session_cookie_failed")),
@@ -287,7 +299,12 @@ export const layer = HttpApiBuilder.group(
299 result.sessionMethod === "browser-session-cookie" &&
300 result.expiresAt
301 ) {
290 - yield* appendSessionCookie(sessions.cookieName, credential.token, result.expiresAt);
302 + yield* appendSessionCookie(
303 + request,
304 + sessions.cookieName,
305 + credential.token,
306 + result.expiresAt,
307 + );
308 yield* appendCredentialResponseHeaders;
309 }
310 return result;
@@ -319,19 +336,17 @@ export const layer = HttpApiBuilder.group(
336 const cookieName = result.cookieName ?? sessions.cookieName;
337 const selectedCookie = yield* Effect.fromResult(
338 Cookies.set(Cookies.empty, cookieName, result.sessionToken, {
339 + ...sessionCookieOptions(request),
340 expires: DateTime.toDate(result.response.expiresAt),
323 - httpOnly: true,
324 - path: "/",
325 - sameSite: "lax",
341 }),
342 ).pipe(Effect.catch(() => failEnvironmentInternal("browser_session_cookie_failed")));
343 const sessionCookies = result.expireNormalCookie
344 ? yield* Effect.fromResult(
330 - Cookies.expireCookie(selectedCookie, sessions.cookieName, {
331 - httpOnly: true,
332 - path: "/",
333 - sameSite: "lax",
334 - }),
345 + Cookies.expireCookie(
346 + selectedCookie,
347 + sessions.cookieName,
348 + sessionCookieOptions(request),
349 + ),
350 ).pipe(Effect.catch(() => failEnvironmentInternal("browser_session_cookie_failed")))
351 : selectedCookie;
352