Skip to content

Commit 2aebbc1

Browse files
committed
fix(server): stabilize remote session cookie migration
1 parent 5d2f538 commit 2aebbc1

13 files changed

Lines changed: 121 additions & 13 deletions

‎apps/server/src/auth/EnvironmentAuth.test.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import * as Effect from "effect/Effect";
55
import * as Layer from "effect/Layer";
66

77
import * as ServerConfig from "../config.ts";
8+
import * as ServerEnvironment from "../environment/ServerEnvironment.ts";
89
import { SqlitePersistenceMemory } from "../persistence/Layers/Sqlite.ts";
910
import * as PairingGrantStore from "./PairingGrantStore.ts";
1011
import * as EnvironmentAuth from "./EnvironmentAuth.ts";
@@ -34,6 +35,7 @@ const makeEnvironmentAuthLayer = (overrides?: Partial<ServerConfig.ServerConfig[
3435
EnvironmentAuth.layer.pipe(
3536
Layer.provide(SqlitePersistenceMemory),
3637
Layer.provide(ServerSecretStore.layer),
38+
Layer.provide(ServerEnvironment.layer.pipe(Layer.provide(ServerSecretStore.layer))),
3739
Layer.provide(makeServerConfigLayer(overrides)),
3840
);
3941

‎apps/server/src/auth/EnvironmentAuth.ts‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import * as Option from "effect/Option";
3030
import * as Schema from "effect/Schema";
3131
import * as HttpServerRequest from "effect/unstable/http/HttpServerRequest";
3232

33+
import * as ServerEnvironment from "../environment/ServerEnvironment.ts";
3334
import * as EnvironmentAuthPolicy from "./EnvironmentAuthPolicy.ts";
3435
import * as PairingGrantStore from "./PairingGrantStore.ts";
3536
import * as ServerSecretStore from "./ServerSecretStore.ts";
@@ -562,6 +563,20 @@ function parseDpopToken(request: HttpServerRequest.HttpServerRequest): string |
562563
return token.length > 0 ? token : null;
563564
}
564565

566+
export function selectedLegacySessionCookieToken(
567+
request: HttpServerRequest.HttpServerRequest,
568+
cookieName: string,
569+
legacyCookieName: string | undefined,
570+
): string | undefined {
571+
const legacyToken = legacyCookieName ? request.cookies[legacyCookieName] : undefined;
572+
return legacyToken &&
573+
!request.cookies[cookieName] &&
574+
!parseBearerToken(request) &&
575+
!parseDpopToken(request)
576+
? legacyToken
577+
: undefined;
578+
}
579+
565580
export const make = Effect.gen(function* () {
566581
const policy = yield* EnvironmentAuthPolicy.EnvironmentAuthPolicy;
567582
const bootstrapCredentials = yield* PairingGrantStore.PairingGrantStore;
@@ -1006,4 +1021,7 @@ export const layer = Layer.effect(EnvironmentAuth, make).pipe(
10061021

10071022
export const storageLayer = Layer.mergeAll(ServerSecretStore.layer, SqlitePersistenceLayer);
10081023

1009-
export const runtimeLayer = layer.pipe(Layer.provideMerge(storageLayer));
1024+
export const runtimeLayer = layer.pipe(
1025+
Layer.provideMerge(storageLayer),
1026+
Layer.provide(ServerEnvironment.layer.pipe(Layer.provide(ServerSecretStore.layer))),
1027+
);

‎apps/server/src/auth/EnvironmentAuthAdmin.test.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import * as Effect from "effect/Effect";
44
import * as Layer from "effect/Layer";
55

66
import * as ServerConfig from "../config.ts";
7+
import * as ServerEnvironment from "../environment/ServerEnvironment.ts";
78
import { SqlitePersistenceMemory } from "../persistence/Layers/Sqlite.ts";
89
import * as EnvironmentAuth from "./EnvironmentAuth.ts";
910
import * as ServerSecretStore from "./ServerSecretStore.ts";
@@ -35,6 +36,7 @@ const makeEnvironmentAuthLayer = (
3536
EnvironmentAuth.layer.pipe(
3637
Layer.provideMerge(ServerSecretStore.layer),
3738
Layer.provideMerge(SqlitePersistenceMemory),
39+
Layer.provide(ServerEnvironment.layer.pipe(Layer.provide(ServerSecretStore.layer))),
3840
Layer.provide(makeServerConfigLayer(overrides)),
3941
);
4042

‎apps/server/src/auth/EnvironmentAuthPolicy.test.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,15 @@ import * as Effect from "effect/Effect";
44
import * as Layer from "effect/Layer";
55

66
import * as ServerConfig from "../config.ts";
7+
import * as ServerEnvironment from "../environment/ServerEnvironment.ts";
78
import * as EnvironmentAuthPolicy from "./EnvironmentAuthPolicy.ts";
9+
import * as ServerSecretStore from "./ServerSecretStore.ts";
810

911
const makeEnvironmentAuthPolicyLayer = (
1012
overrides?: Partial<ServerConfig.ServerConfig["Service"]>,
1113
) =>
1214
EnvironmentAuthPolicy.layer.pipe(
15+
Layer.provide(ServerEnvironment.layer.pipe(Layer.provide(ServerSecretStore.layer))),
1316
Layer.provide(
1417
Layer.effect(
1518
ServerConfig.ServerConfig,

‎apps/server/src/auth/EnvironmentAuthPolicy.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import * as Effect from "effect/Effect";
44
import * as Layer from "effect/Layer";
55

66
import * as ServerConfig from "../config.ts";
7+
import * as ServerEnvironment from "../environment/ServerEnvironment.ts";
78
import { isRemoteReachableHost, resolveSessionCookieName } from "./utils.ts";
89

910
export class EnvironmentAuthPolicy extends Context.Service<
@@ -15,6 +16,7 @@ export class EnvironmentAuthPolicy extends Context.Service<
1516

1617
export const make = Effect.gen(function* () {
1718
const config = yield* ServerConfig.ServerConfig;
19+
const serverEnvironment = yield* ServerEnvironment.ServerEnvironment;
1820
const isRemoteReachable = isRemoteReachableHost(config.host);
1921

2022
const policy =
@@ -42,6 +44,7 @@ export const make = Effect.gen(function* () {
4244
port: config.port,
4345
host: config.host,
4446
instanceKey: config.stateDir,
47+
environmentId: yield* serverEnvironment.getEnvironmentId,
4548
development: config.devUrl !== undefined,
4649
}),
4750
};

‎apps/server/src/auth/SessionStore.test.ts‎

Lines changed: 34 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 { expect, it } from "@effect/vitest";
34
import * as Duration from "effect/Duration";
45
import * as Effect from "effect/Effect";
@@ -7,15 +8,14 @@ import * as TestClock from "effect/testing/TestClock";
78
import * as SqlClient from "effect/unstable/sql/SqlClient";
89

910
import * as ServerConfig from "../config.ts";
11+
import * as ServerEnvironment from "../environment/ServerEnvironment.ts";
1012
import { PersistenceSqlError } from "../persistence/Errors.ts";
1113
import { SqlitePersistenceMemory } from "../persistence/Layers/Sqlite.ts";
1214
import * as AuthSessions from "../persistence/AuthSessions.ts";
1315
import * as SessionStore from "./SessionStore.ts";
1416
import * as ServerSecretStore from "./ServerSecretStore.ts";
1517

16-
const makeServerConfigLayer = (
17-
overrides?: Partial<Pick<ServerConfig.ServerConfig["Service"], "desktopBootstrapToken">>,
18-
) =>
18+
const makeServerConfigLayer = (overrides?: Partial<ServerConfig.ServerConfig["Service"]>) =>
1919
Layer.effect(
2020
ServerConfig.ServerConfig,
2121
Effect.gen(function* () {
@@ -27,12 +27,20 @@ const makeServerConfigLayer = (
2727
}),
2828
).pipe(Layer.provide(ServerConfig.layerTest(process.cwd(), { prefix: "t3-auth-session-test-" })));
2929

30+
const makeServerEnvironmentLayer = (environmentId: EnvironmentId) =>
31+
Layer.succeed(ServerEnvironment.ServerEnvironment, {
32+
getEnvironmentId: Effect.succeed(environmentId),
33+
getDescriptor: Effect.die(new Error("unused in SessionStore tests")),
34+
});
35+
3036
const makeSessionStoreLayer = (
31-
overrides?: Partial<Pick<ServerConfig.ServerConfig["Service"], "desktopBootstrapToken">>,
37+
overrides?: Partial<ServerConfig.ServerConfig["Service"]>,
38+
environmentId = EnvironmentId.make("test-environment"),
3239
) =>
3340
SessionStore.layer.pipe(
3441
Layer.provide(SqlitePersistenceMemory),
3542
Layer.provide(ServerSecretStore.layer),
43+
Layer.provide(makeServerEnvironmentLayer(environmentId)),
3644
Layer.provide(makeServerConfigLayer(overrides)),
3745
);
3846

@@ -58,10 +66,32 @@ const failingSessionLookupCredentialLayer = Layer.effect(
5866
Layer.provide(failingSessionLookupRepositoryLayer),
5967
Layer.provide(ServerSecretStore.layer),
6068
Layer.provide(SqlitePersistenceMemory),
69+
Layer.provide(makeServerEnvironmentLayer(EnvironmentId.make("test-environment"))),
6170
Layer.provide(makeServerConfigLayer()),
6271
);
6372

6473
it.layer(NodeServices.layer)("SessionStore.layer", (it) => {
74+
it.effect("keys remote cookies by environment identity instead of state directory", () =>
75+
Effect.gen(function* () {
76+
const cookieName = (stateDir: string, environmentId: EnvironmentId) =>
77+
Effect.gen(function* () {
78+
const sessions = yield* SessionStore.SessionStore;
79+
return sessions.cookieName;
80+
}).pipe(
81+
Effect.provide(
82+
makeSessionStoreLayer({ mode: "web", host: "192.168.1.50", stateDir }, environmentId),
83+
),
84+
);
85+
86+
const original = yield* cookieName("/srv/t3-one", EnvironmentId.make("environment-one"));
87+
const moved = yield* cookieName("/srv/t3-moved", EnvironmentId.make("environment-one"));
88+
const other = yield* cookieName("/srv/t3-one", EnvironmentId.make("environment-two"));
89+
90+
expect(moved).toBe(original);
91+
expect(other).not.toBe(original);
92+
}),
93+
);
94+
6595
it.effect("issues and verifies signed browser session tokens", () =>
6696
Effect.gen(function* () {
6797
const sessions = yield* SessionStore.SessionStore;

‎apps/server/src/auth/SessionStore.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import * as Stream from "effect/Stream";
2121
import * as Option from "effect/Option";
2222

2323
import * as ServerConfig from "../config.ts";
24+
import * as ServerEnvironment from "../environment/ServerEnvironment.ts";
2425
import * as AuthSessions from "../persistence/AuthSessions.ts";
2526
import * as ServerSecretStore from "./ServerSecretStore.ts";
2627
import {
@@ -472,6 +473,7 @@ function toAuthClientSession(input: Omit<AuthClientSession, "current">): AuthCli
472473
export const make = Effect.gen(function* () {
473474
const crypto = yield* Crypto.Crypto;
474475
const serverConfig = yield* ServerConfig.ServerConfig;
476+
const serverEnvironment = yield* ServerEnvironment.ServerEnvironment;
475477
const secretStore = yield* ServerSecretStore.ServerSecretStore;
476478
const authSessions = yield* AuthSessions.AuthSessionRepository;
477479
const signingSecret = yield* secretStore.getOrCreateRandom(SIGNING_SECRET_NAME, 32);
@@ -482,6 +484,7 @@ export const make = Effect.gen(function* () {
482484
port: serverConfig.port,
483485
host: serverConfig.host,
484486
instanceKey: serverConfig.stateDir,
487+
environmentId: yield* serverEnvironment.getEnvironmentId,
485488
development: serverConfig.devUrl !== undefined,
486489
} as const;
487490
const cookieName = resolveSessionCookieName(cookieInput);

‎apps/server/src/auth/http.ts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -242,10 +242,11 @@ export const authHttpApiLayer = HttpApiBuilder.group(
242242
yield* annotateEnvironmentRequest(args.endpoint.name);
243243
const request = yield* HttpServerRequest.HttpServerRequest;
244244
const result = yield* serverAuth.getSessionState(request);
245-
const legacyToken =
246-
sessions.legacyCookieName && !request.cookies[sessions.cookieName]
247-
? request.cookies[sessions.legacyCookieName]
248-
: undefined;
245+
const legacyToken = EnvironmentAuth.selectedLegacySessionCookieToken(
246+
request,
247+
sessions.cookieName,
248+
sessions.legacyCookieName,
249+
);
249250
if (
250251
legacyToken &&
251252
result.authenticated &&

‎apps/server/src/auth/utils.test.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,15 @@ describe("session cookie isolation", () => {
6464
port: 5775,
6565
host: "127.0.0.1",
6666
instanceKey: "/tmp/t3-agent-one",
67+
environmentId: "environment-one",
6768
development: true,
6869
});
6970
const second = resolveSessionCookieName({
7071
mode: "web",
7172
port: 5775,
7273
host: "127.0.0.1",
7374
instanceKey: "/tmp/t3-agent-two",
75+
environmentId: "environment-two",
7476
development: true,
7577
});
7678

@@ -85,13 +87,15 @@ describe("session cookie isolation", () => {
8587
port: 3773,
8688
host: "192.168.1.50",
8789
instanceKey: "/srv/t3-one",
90+
environmentId: "environment-one",
8891
development: false,
8992
});
9093
const second = resolveSessionCookieName({
9194
mode: "web",
9295
port: 5775,
9396
host: "192.168.1.50",
9497
instanceKey: "/srv/t3-two",
98+
environmentId: "environment-two",
9599
development: false,
96100
});
97101

@@ -106,13 +110,15 @@ describe("session cookie isolation", () => {
106110
port: 8080,
107111
host: "0.0.0.0",
108112
instanceKey: "/srv/t3",
113+
environmentId: "environment-one",
109114
development: false,
110115
});
111116
const second = resolveSessionCookieName({
112117
mode: "web",
113118
port: 9090,
114119
host: "app.example.com",
115120
instanceKey: "/srv/t3",
121+
environmentId: "environment-one",
116122
development: false,
117123
});
118124

@@ -126,6 +132,7 @@ describe("session cookie isolation", () => {
126132
port: 3773,
127133
host: "127.0.0.1",
128134
instanceKey: "/tmp/desktop",
135+
environmentId: "environment-one",
129136
development: true,
130137
}),
131138
).toBe("t3_session_3773");
@@ -138,6 +145,7 @@ describe("session cookie isolation", () => {
138145
port: 5775,
139146
host: "0.0.0.0",
140147
instanceKey: "/tmp/t3-wildcard-dev",
148+
environmentId: "environment-one",
141149
development: true,
142150
}),
143151
).toMatch(/^t3_session_5775_[a-f0-9]{12}$/);

‎apps/server/src/auth/utils.ts‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ const SESSION_COOKIE_NAME = "t3_session";
1616
* clobbers the first's session and both sides see "Invalid session token
1717
* signature" until someone clears cookies by hand.
1818
*
19-
* Web servers use a state-specific name. Remote servers omit the port so the
20-
* name stays stable when their public port changes.
19+
* Remote web servers use their persisted environment identity and omit the
20+
* port, so the name survives state-directory moves and public port changes.
2121
*
2222
* Desktop scans upward from 3773 for a free port and binds
2323
* 127.0.0.1, so a second instance lands on a different port and the same host.
@@ -27,14 +27,19 @@ export function resolveSessionCookieName(input: {
2727
readonly port: number;
2828
readonly host: string | undefined;
2929
readonly instanceKey: string;
30+
readonly environmentId: string;
3031
readonly development: boolean;
3132
}): string {
3233
if (input.mode === "desktop") {
3334
return `${SESSION_COOKIE_NAME}_${input.port}`;
3435
}
3536

3637
const instanceHash = NodeCrypto.createHash("sha256")
37-
.update(input.instanceKey)
38+
.update(
39+
!input.development && isRemoteReachableHost(input.host)
40+
? input.environmentId
41+
: input.instanceKey,
42+
)
3843
.digest("hex")
3944
.slice(0, 12);
4045

0 commit comments

Comments
 (0)