Skip to content

Commit 6fa82f4

Browse files
only21milclaude
andcommitted
fix(server): advertise the Tailscale Serve URL only when it reaches this server
Serve keys a mapping by port alone, so a server that leaves another server's mapping in place still got a 2xx from the tailnet URL and advertised it as its own route. The probe now compares the environment id the URL reports with this server's id. The desktop endpoint provider reads its backend's id from the local URL and uses the same check. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 8ab1965 commit 6fa82f4

7 files changed

Lines changed: 121 additions & 23 deletions

File tree

‎apps/desktop/src/backend/DesktopServerExposure.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -572,6 +572,7 @@ export const make = Effect.gen(function* () {
572572
port: state.port,
573573
serveEnabled: state.tailscaleServeEnabled,
574574
servePort: state.tailscaleServePort,
575+
localHttpUrl: state.localHttpUrl,
575576
networkInterfaces: currentNetworkInterfaces,
576577
readStatus: Cache.get(
577578
tailscaleStatusCache,

‎apps/desktop/src/backend/tailscaleEndpointProvider.test.ts‎

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { assert, describe, it } from "@effect/vitest";
22
import * as Effect from "effect/Effect";
33
import * as Layer from "effect/Layer";
4-
import { HttpClient } from "effect/http";
4+
import { HttpClient, HttpClientResponse } from "effect/http";
55
import { ChildProcessSpawner } from "effect/process";
66

77
import { resolveTailscaleAdvertisedEndpoints } from "./tailscaleEndpointProvider.ts";
@@ -22,11 +22,55 @@ const protonAndTailscaleInterfaces = {
2222
tailscale0: [{ address: "100.74.126.34", family: "IPv4", internal: false }],
2323
};
2424

25+
/** The local backend reports `this-desktop`; the tailnet URL reports `servedEnvironmentId`. */
26+
const layerServeAnswers = (servedEnvironmentId: string) =>
27+
Layer.mergeAll(
28+
Layer.succeed(
29+
HttpClient.HttpClient,
30+
HttpClient.make((request) => {
31+
const environmentId = request.url.startsWith("http://127.0.0.1:3773/")
32+
? "this-desktop"
33+
: servedEnvironmentId;
34+
return Effect.succeed(
35+
HttpClientResponse.fromWeb(request, new Response(JSON.stringify({ environmentId }))),
36+
);
37+
}),
38+
),
39+
Layer.succeed(
40+
ChildProcessSpawner.ChildProcessSpawner,
41+
ChildProcessSpawner.make(() => Effect.die("unexpected tailscale status process")),
42+
),
43+
);
44+
45+
const resolveServeEndpointStatus = (servedEnvironmentId: string) =>
46+
resolveTailscaleAdvertisedEndpoints({
47+
port: 3773,
48+
serveEnabled: true,
49+
localHttpUrl: "http://127.0.0.1:3773",
50+
networkInterfaces: {},
51+
statusJson: `{"Self":{"DNSName":"desktop.tail.ts.net.","TailscaleIPs":[]}}`,
52+
}).pipe(
53+
Effect.map((endpoints) => endpoints.map((endpoint) => [endpoint.httpBaseUrl, endpoint.status])),
54+
Effect.provide(layerServeAnswers(servedEnvironmentId)),
55+
);
56+
2557
describe("tailscale endpoint provider", () => {
58+
it.effect("lists Tailscale HTTPS as available only while it reaches this desktop's server", () =>
59+
Effect.gen(function* () {
60+
assert.deepEqual(yield* resolveServeEndpointStatus("this-desktop"), [
61+
["https://desktop.tail.ts.net/", "available"],
62+
]);
63+
assert.deepEqual(yield* resolveServeEndpointStatus("other-desktop"), [
64+
["https://desktop.tail.ts.net/", "unavailable"],
65+
]);
66+
}),
67+
);
68+
2669
it.effect("does not advertise Proton's CGNAT address as a Tailscale pairing endpoint", () =>
2770
Effect.gen(function* () {
2871
const endpoints = yield* resolveTailscaleAdvertisedEndpoints({
2972
port: 3773,
73+
localHttpUrl: "http://127.0.0.1:3773",
3074
networkInterfaces: protonAndTailscaleInterfaces,
3175
statusJson: `{"Self":{"TailscaleIPs":["100.74.126.34"]}}`,
3276
});
@@ -43,6 +87,7 @@ describe("tailscale endpoint provider", () => {
4387
for (const statusJson of [null, "not-json", `{"Self":{"TailscaleIPs":[]}}`]) {
4488
const endpoints = yield* resolveTailscaleAdvertisedEndpoints({
4589
port: 3773,
90+
localHttpUrl: "http://127.0.0.1:3773",
4691
networkInterfaces: {
4792
pvpnksintrf1: protonAndTailscaleInterfaces.pvpnksintrf1,
4893
[interfaceName]: protonAndTailscaleInterfaces.tailscale0,
@@ -64,6 +109,7 @@ describe("tailscale endpoint provider", () => {
64109
Effect.gen(function* () {
65110
const endpoints = yield* resolveTailscaleAdvertisedEndpoints({
66111
port: 3773,
112+
localHttpUrl: "http://127.0.0.1:3773",
67113
networkInterfaces: {
68114
utun3: [{ address: "100.85.0.1", family: "IPv4", internal: false }],
69115
utun4: [

‎apps/desktop/src/backend/tailscaleEndpointProvider.ts‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import {
55
isTailscaleIpv4Address,
66
parseTailscaleStatus,
77
probeTailscaleHttpsEndpoint,
8+
readT3EnvironmentId,
89
readTailscaleStatus,
910
type TailscaleStatus,
1011
} from "@t3tools/tailscale";
@@ -77,6 +78,7 @@ const resolveTailscaleMagicDnsAdvertisedEndpoint = Effect.fn(
7778
readonly dnsName: string | null;
7879
readonly serveEnabled: boolean;
7980
readonly servePort?: number;
81+
readonly localHttpUrl: string;
8082
readonly probe?: (baseUrl: string) => Effect.Effect<boolean, never, HttpClient.HttpClient>;
8183
}): Effect.fn.Return<Option.Option<AdvertisedEndpoint>, never, HttpClient.HttpClient> {
8284
if (!input.dnsName) {
@@ -89,9 +91,15 @@ const resolveTailscaleMagicDnsAdvertisedEndpoint = Effect.fn(
8991
});
9092
const probe =
9193
input.probe?.(httpBaseUrl) ??
92-
probeTailscaleHttpsEndpoint({
93-
baseUrl: httpBaseUrl,
94-
});
94+
readT3EnvironmentId({ baseUrl: input.localHttpUrl }).pipe(
95+
Effect.flatMap(
96+
Option.match({
97+
onNone: () => Effect.succeed(false),
98+
onSome: (environmentId) =>
99+
probeTailscaleHttpsEndpoint({ baseUrl: httpBaseUrl, environmentId }),
100+
}),
101+
),
102+
);
95103
const isReachable = input.serveEnabled ? yield* probe : false;
96104

97105
return Option.some(
@@ -116,6 +124,7 @@ export const resolveTailscaleAdvertisedEndpoints = Effect.fn("resolveTailscaleAd
116124
readonly port: number;
117125
readonly serveEnabled?: boolean;
118126
readonly servePort?: number;
127+
readonly localHttpUrl: string;
119128
readonly networkInterfaces: NetworkInterfaces;
120129
readonly statusJson?: string | null;
121130
readonly readStatus?: Effect.Effect<
@@ -141,6 +150,7 @@ export const resolveTailscaleAdvertisedEndpoints = Effect.fn("resolveTailscaleAd
141150
const magicDnsEndpoint = yield* resolveTailscaleMagicDnsAdvertisedEndpoint({
142151
dnsName: status?.magicDnsName ?? null,
143152
serveEnabled: input.serveEnabled === true,
153+
localHttpUrl: input.localHttpUrl,
144154
...(input.servePort === undefined ? {} : { servePort: input.servePort }),
145155
...(input.probe === undefined ? {} : { probe: input.probe }),
146156
});

‎apps/server/src/environment/DirectEndpoints.test.ts‎

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import * as NodeServices from "@effect/platform-node/NodeServices";
2+
import { EnvironmentId } from "@t3tools/contracts";
23
import { it as effectIt } from "@effect/vitest";
34
import type * as NodeOS from "node:os";
45
import * as Effect from "effect/Effect";
@@ -13,6 +14,7 @@ import { describe, expect, it } from "vite-plus/test";
1314
import * as ServerConfig from "../config.ts";
1415
import * as DirectEndpoints from "./DirectEndpoints.ts";
1516
import { resolveBoundEndpoints } from "./DirectEndpoints.ts";
17+
import * as ServerEnvironment from "./ServerEnvironment.ts";
1618

1719
const INTERFACES: ReturnType<typeof NodeOS.networkInterfaces> = {
1820
lo0: [
@@ -192,14 +194,23 @@ const layerTailscaleUp = Layer.succeed(
192194
),
193195
);
194196

195-
const layerServeProbe = (status: number) =>
197+
const layerServeProbe = (status: number, servedEnvironmentId = "this-server") =>
196198
Layer.succeed(
197199
HttpClient.HttpClient,
198200
HttpClient.make((request) =>
199-
Effect.succeed(HttpClientResponse.fromWeb(request, new Response(null, { status }))),
201+
Effect.succeed(
202+
HttpClientResponse.fromWeb(
203+
request,
204+
new Response(JSON.stringify({ environmentId: servedEnvironmentId }), { status }),
205+
),
206+
),
200207
),
201208
);
202209

210+
const layerThisServer = Layer.succeed(ServerEnvironment.ServerEnvironmentIdentity, {
211+
getEnvironmentId: Effect.succeed(EnvironmentId.make("this-server")),
212+
});
213+
203214
const layerServeConfig = Layer.effect(
204215
ServerConfig.ServerConfig,
205216
Effect.map(ServerConfig.ServerConfig, (config) => ({
@@ -213,12 +224,17 @@ const layerServeConfig = Layer.effect(
213224
Layer.provide(NodeServices.layer),
214225
);
215226

216-
const resolveWithServe = (probeStatus: number) =>
227+
const resolveWithServe = (probeStatus: number, servedEnvironmentId?: string) =>
217228
Effect.flatMap(DirectEndpoints.DirectEndpoints, (service) => service.resolve()).pipe(
218229
Effect.provide(
219230
DirectEndpoints.layer.pipe(
220231
Layer.provide(
221-
Layer.mergeAll(layerServeConfig, layerTailscaleUp, layerServeProbe(probeStatus)),
232+
Layer.mergeAll(
233+
layerServeConfig,
234+
layerTailscaleUp,
235+
layerServeProbe(probeStatus, servedEnvironmentId),
236+
layerThisServer,
237+
),
222238
),
223239
),
224240
),
@@ -238,4 +254,10 @@ describe("DirectEndpoints Tailscale Serve", () => {
238254
expect(yield* resolveWithServe(502)).toEqual([]);
239255
}),
240256
);
257+
258+
effectIt.effect("leaves the tailnet name out when Serve forwards to another server", () =>
259+
Effect.gen(function* () {
260+
expect(yield* resolveWithServe(200, "other-server")).toEqual([]);
261+
}),
262+
);
241263
});

‎apps/server/src/environment/DirectEndpoints.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import * as NodeOS from "node:os";
1717
import { isTailnetHost } from "@t3tools/shared/hostClassification";
1818

1919
import * as ServerConfig from "../config.ts";
20+
import * as ServerEnvironment from "./ServerEnvironment.ts";
2021
import {
2122
formatHostForUrl,
2223
isLoopbackHost,
@@ -111,6 +112,7 @@ export const make = Effect.gen(function* () {
111112
const config = yield* ServerConfig.ServerConfig;
112113
const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
113114
const httpClient = yield* HttpClient.HttpClient;
115+
const serverEnvironment = yield* ServerEnvironment.ServerEnvironmentIdentity;
114116
// Only the service default listens on every interface without being asked,
115117
// so only it checks once whether it runs in a cloud. The check starts now so
116118
// the first client does not wait for its timeout.
@@ -138,7 +140,10 @@ export const make = Effect.gen(function* () {
138140
magicDnsName,
139141
servePort: config.tailscaleServePort,
140142
});
141-
return probeTailscaleHttpsEndpoint({ baseUrl: httpBaseUrl }).pipe(
143+
return serverEnvironment.getEnvironmentId.pipe(
144+
Effect.flatMap((environmentId) =>
145+
probeTailscaleHttpsEndpoint({ baseUrl: httpBaseUrl, environmentId }),
146+
),
142147
Effect.map((reachable) => (reachable ? httpBaseUrl : null)),
143148
);
144149
}),

‎apps/server/src/server.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ const layerRuntimeDependencies = layerRuntimeCoreDependencies.pipe(
686686
Layer.provideMerge(AnalyticsService.layer),
687687
Layer.provideMerge(ExternalLauncher.layer),
688688
Layer.provideMerge(RemoteOpenTargets.layer),
689-
Layer.provideMerge(DirectEndpoints.layer),
689+
Layer.provideMerge(DirectEndpoints.layer.pipe(Layer.provide(layerServerEnvironment))),
690690
Layer.provideMerge(ServerLifecycleEvents.layer),
691691
Layer.provide(NetService.layer),
692692
);

‎packages/tailscale/src/tailscale.ts‎

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import * as Effect from "effect/Effect";
66
import * as Option from "effect/Option";
77
import * as Schema from "effect/Schema";
88
import * as Stream from "effect/Stream";
9-
import { HttpClient, HttpClientRequest } from "effect/http";
9+
import { HttpClient, HttpClientRequest, HttpClientResponse } from "effect/http";
1010
import { ChildProcess, ChildProcessSpawner } from "effect/process";
1111

1212
export const DEFAULT_TAILSCALE_SERVE_PORT = 443;
@@ -593,19 +593,33 @@ export const releaseTailscaleServe = Effect.fn("tailscale.releaseTailscaleServe"
593593
return true;
594594
});
595595

596-
export const probeTailscaleHttpsEndpoint = Effect.fn("tailscale.probeTailscaleHttpsEndpoint")(
596+
const T3EnvironmentIdentity = Schema.Struct({ environmentId: Schema.String });
597+
598+
/** The environment id the T3 server at `baseUrl` reports, if one answers there. */
599+
export const readT3EnvironmentId = Effect.fn("tailscale.readT3EnvironmentId")(
597600
function* (input: { readonly baseUrl: string; readonly timeout?: Duration.Input }) {
598601
const client = yield* HttpClient.HttpClient;
599-
const response = yield* Effect.gen(function* () {
600-
const url = new URL("/.well-known/t3/environment", input.baseUrl);
601-
const request = HttpClientRequest.get(url.toString());
602-
return yield* client.execute(request);
603-
}).pipe(Effect.timeoutOption(input.timeout ?? TAILSCALE_PROBE_TIMEOUT));
604-
605-
return Option.match(response, {
606-
onNone: () => false,
607-
onSome: (httpResponse) => httpResponse.status >= 200 && httpResponse.status < 300,
608-
});
602+
const url = new URL("/.well-known/t3/environment", input.baseUrl);
603+
const identity = yield* client
604+
.execute(HttpClientRequest.get(url.toString()))
605+
.pipe(
606+
Effect.flatMap(HttpClientResponse.filterStatusOk),
607+
Effect.flatMap(HttpClientResponse.schemaBodyJson(T3EnvironmentIdentity)),
608+
Effect.timeoutOption(input.timeout ?? TAILSCALE_PROBE_TIMEOUT),
609+
);
610+
return Option.map(identity, (body) => body.environmentId);
611+
},
612+
Effect.orElseSucceed(() => Option.none<string>()),
613+
);
614+
615+
/** Serve keys a mapping by port alone, so another server on this host can answer the URL. */
616+
export const probeTailscaleHttpsEndpoint = Effect.fn("tailscale.probeTailscaleHttpsEndpoint")(
617+
function* (input: {
618+
readonly baseUrl: string;
619+
readonly environmentId: string;
620+
readonly timeout?: Duration.Input;
621+
}) {
622+
const served = yield* readT3EnvironmentId(input);
623+
return Option.contains(served, input.environmentId);
609624
},
610-
Effect.orElseSucceed(() => false),
611625
);

0 commit comments

Comments
 (0)