@devries-cameron20 / t3code Mirror · read-only / commits / fa5fde4bea
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, 12:15 UTC

fix(server): clients paired over Tailscale Serve keep their own address (#35559)

Julius Marminge committed Nov 14, 2026 at 20:52 UTC fa5fde4bea16c5abc23a92bdba8dc9ba2c792548
2 files changed +37 -1
apps/server/src/auth/utils.test.ts
+23
@@ -24,6 +24,29 @@ describe("deriveAuthClientMetadata", () => {
24 });
25 });
26
27 + it("records the forwarded client address of a request proxied by Tailscale Serve", () => {
28 + const metadata = deriveAuthClientMetadata({
29 + request: {
30 + headers: {
31 + "x-forwarded-for": "100.64.0.2",
32 + "x-forwarded-host": "host-a.tailnet-name.ts.net",
33 + "x-forwarded-proto": "https",
34 + },
35 + source: { remoteAddress: "127.0.0.1" },
36 + } as never,
37 + });
38 +
39 + expect(metadata.ipAddress).toBe("100.64.0.2");
40 +
41 + const direct = deriveAuthClientMetadata({
42 + request: {
43 + headers: { "x-forwarded-for": "100.64.0.2" },
44 + source: { remoteAddress: "192.168.1.20" },
45 + } as never,
46 + });
47 + expect(direct.ipAddress).toBe("192.168.1.20");
48 + });
49 +
50 it.each([
51 [
52 "Edge on Android",
apps/server/src/auth/utils.ts
+14 -1
@@ -166,12 +166,25 @@ function readRemoteAddressFromSource(source: unknown): string | undefined {
166 return normalizeIpAddress(candidate.socket?.remoteAddress ?? candidate.remoteAddress);
167 }
168
169 +const isLoopbackIpAddress = (address: string): boolean =>
170 + (NodeNet.isIPv4(address) && address.startsWith("127.")) || address === "::1";
171 +
172 +// A loopback peer is a local reverse proxy (Tailscale Serve); trust only the entry it appended.
173 +function resolveClientIpAddress(request: HttpServerRequest.HttpServerRequest): string | undefined {
174 + const peer = readRemoteAddressFromSource(request.source);
175 + if (!peer || !isLoopbackIpAddress(peer)) {
176 + return peer;
177 + }
178 + const forwarded = normalizeIpAddress(request.headers["x-forwarded-for"]?.split(",").at(-1));
179 + return forwarded && NodeNet.isIP(forwarded) !== 0 ? forwarded : peer;
180 +}
181 +
182 export function deriveAuthClientMetadata(input: {
183 readonly request: HttpServerRequest.HttpServerRequest;
184 readonly presented?: AuthClientPresentationMetadata;
185 }): AuthClientMetadata {
186 const userAgent = normalizeNonEmptyString(input.request.headers["user-agent"]);
174 - const ipAddress = readRemoteAddressFromSource(input.request.source);
187 + const ipAddress = resolveClientIpAddress(input.request);
188 const os = input.presented?.os ?? inferOs(userAgent);
189 const browser = inferBrowser(userAgent);
190 return {