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 22, 04:30 UTC
refactor(server): sign server tokens through PayloadSigner (#30523)
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Julius Marminge committed
Nov 4, 2026 at 10:35 UTC
16fc3cc45b3816184efe4061195d695efc8cafea
16 files changed
+152
-153
apps/server/src/assets/AssetAccess.test.ts
+4
-1
@@ -25,6 +25,7 @@ import * as TestClock from "effect/testing/TestClock";
25
import { HttpClientRequest, HttpClientResponse, HttpServerResponse } from "effect/http";
26
import { vi } from "vite-plus/test";
27
28
+import * as AssetSigner from "./AssetSigner.ts";
29
import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
30
import * as ServerConfig from "../config.ts";
31
import * as Orchestrator from "../orchestration-v2/Orchestrator.ts";
@@ -119,7 +120,9 @@ const layerTest = Layer.mergeAll(
120
Layer.provide(T3ProjectFileLoader.layer),
121
),
122
NativeAppIconResolver.layer.pipe(Layer.provide(layerConfig)),
122
- ServerSecretStore.layer.pipe(Layer.provide(layerConfig)),
123
+ AssetSigner.layer.pipe(
124
+ Layer.provideMerge(ServerSecretStore.layer.pipe(Layer.provide(layerConfig))),
125
+ ),
126
).pipe(Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)));
127
128
describe("AssetAccess", () => {
apps/server/src/assets/AssetAccess.ts
+13
-24
@@ -47,13 +47,8 @@ import * as Path from "effect/Path";
47
import * as Schema from "effect/Schema";
48
import * as Stream from "effect/Stream";
49
50
-import {
51
- base64UrlDecodeUtf8,
52
- base64UrlEncode,
53
- signPayload,
54
- verifyPayloadSignature,
55
-} from "../auth/utils.ts";
56
-import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
50
+import { base64UrlDecodeUtf8, base64UrlEncode } from "../auth/utils.ts";
51
+import * as AssetSigner from "./AssetSigner.ts";
52
import { makeIsServerInternalPath } from "../auth/serverInternalPaths.ts";
53
import { parseAttachmentFileExtension, resolveAttachmentPathById } from "../attachmentStore.ts";
54
import * as ServerConfig from "../config.ts";
@@ -70,7 +65,6 @@ import * as HostProcess from "@t3tools/shared/HostProcess";
65
66
export const ASSET_ROUTE_PREFIX = "/api/assets";
67
73
-const SIGNING_SECRET_NAME = "asset-access-signing-key";
68
const ASSET_TOKEN_TTL_MS = 60 * 60 * 1000;
69
const PROJECT_FAVICON_TOKEN_BUCKET_MS = 30 * 60 * 1000;
70
const HTML_ATTACHMENT_TOKEN_BUCKET_MS = 30 * 60 * 1000;
@@ -848,16 +842,6 @@ export const issueAssetUrl = Effect.fn("AssetAccess.issueAssetUrl")(function* (i
842
}
843
}
844
851
- const secretStore = yield* ServerSecretStore.ServerSecretStore;
852
- const signingSecret = yield* secretStore.getOrCreateRandom(SIGNING_SECRET_NAME, 32).pipe(
853
- Effect.mapError(
854
- (cause) =>
855
- new AssetSigningKeyLoadError({
856
- resource: input.resource,
857
- cause,
858
- }),
859
- ),
860
- );
845
if (claims.kind === "project-favicon" || claims.kind === "project-favicon-external") {
846
const issuedAt = yield* Clock.currentTimeMillis;
847
expiresAt =
@@ -872,7 +856,13 @@ export const issueAssetUrl = Effect.fn("AssetAccess.issueAssetUrl")(function* (i
856
claims = { ...claims, expiresAt };
857
}
858
const encodedPayload = base64UrlEncode(encodeAssetClaims(claims));
875
- const token = `${encodedPayload}.${yield* signPayload(encodedPayload, signingSecret)}`;
859
+ const signer = yield* AssetSigner.AssetSigner;
860
+ const signature = yield* signer
861
+ .sign(encodedPayload)
862
+ .pipe(
863
+ Effect.mapError((cause) => new AssetSigningKeyLoadError({ resource: input.resource, cause })),
864
+ );
865
+ const token = `${encodedPayload}.${signature}`;
866
return {
867
relativeUrl: `${ASSET_ROUTE_PREFIX}/${token}/${encodeURIComponent(fileName)}`,
868
expiresAt,
@@ -889,13 +879,12 @@ export const resolveAsset = Effect.fn("AssetAccess.resolveAsset")(function* (
879
const [encodedPayload, signature] = token.split(".");
880
if (!encodedPayload || !signature) return null;
881
892
- const secretStore = yield* ServerSecretStore.ServerSecretStore;
893
- const signingSecret = yield* secretStore.getOrCreateRandom(SIGNING_SECRET_NAME, 32).pipe(
882
+ const signer = yield* AssetSigner.AssetSigner;
883
+ const verified = yield* signer.verify(encodedPayload, signature).pipe(
884
Effect.tapError((cause) => Effect.logError("Failed to load the asset signing key.", { cause })),
895
- Effect.orElseSucceed(() => null),
885
+ Effect.orElseSucceed(() => false),
886
);
897
- if (!signingSecret) return null;
898
- if (!(yield* verifyPayloadSignature(encodedPayload, signature, signingSecret))) return null;
887
+ if (!verified) return null;
888
889
const claims = decodeClaims(encodedPayload);
890
if (!claims || claims.expiresAt <= (yield* Clock.currentTimeMillis)) return null;
apps/server/src/assets/AssetSigner.ts
new
+13
@@ -0,0 +1,13 @@
1
+import * as Context from "effect/Context";
2
+import * as Layer from "effect/Layer";
3
+
4
+import * as PayloadSigner from "../auth/PayloadSigner.ts";
5
+import type * as ServerSecretStore from "../auth/ServerSecretStore.ts";
6
+
7
+/** Signs asset and attachment-upload URLs; both share one key. */
8
+export class AssetSigner extends Context.Service<
9
+ AssetSigner,
10
+ PayloadSigner.PayloadSigner<ServerSecretStore.SecretStoreError>
11
+>()("t3/assets/AssetSigner") {}
12
+
13
+export const layer = Layer.effect(AssetSigner, PayloadSigner.make("asset-access-signing-key"));
apps/server/src/assets/AttachmentUpload.test.ts
+6
-5
@@ -1,3 +1,4 @@
1
+import * as AssetSigner from "./AssetSigner.ts";
2
import * as DocumentText from "../provider/DocumentText.ts";
3
// @effect-diagnostics nodeBuiltinImport:off
4
import * as NodeFS from "node:fs";
@@ -17,7 +18,7 @@ import * as Schema from "effect/Schema";
18
import * as Stream from "effect/Stream";
19
20
import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
20
-import { base64UrlEncode, signPayload } from "../auth/utils.ts";
21
+import { base64UrlEncode } from "../auth/utils.ts";
22
import * as ServerConfig from "../config.ts";
23
import {
24
claimPendingAttachments,
@@ -31,7 +32,8 @@ import {
32
validateAttachmentUploadToken,
33
} from "./AttachmentUpload.ts";
34
34
-const layerTest = ServerSecretStore.layer.pipe(
35
+const layerTest = AssetSigner.layer.pipe(
36
+ Layer.provideMerge(ServerSecretStore.layer),
37
Layer.provideMerge(ServerConfig.layerTest(process.cwd(), { prefix: "t3-attachment-upload-" })),
38
Layer.provideMerge(
39
DocumentText.layer.pipe(
@@ -152,8 +154,7 @@ describe("AttachmentUpload", () => {
154
it.effect("accepts unexpired image upload tokens issued before file support", () =>
155
Effect.gen(function* () {
156
const issued = yield* issueAttachmentUploadUrl(uploadInput);
155
- const secretStore = yield* ServerSecretStore.ServerSecretStore;
156
- const secret = yield* secretStore.getOrCreateRandom("asset-access-signing-key", 32);
157
+ const signer = yield* AssetSigner.AssetSigner;
158
const encodedPayload = base64UrlEncode(
159
yield* encodeLegacyAttachmentUploadClaims({
160
version: 1,
@@ -165,7 +166,7 @@ describe("AttachmentUpload", () => {
166
expiresAt: issued.expiresAt,
167
}),
168
);
168
- const legacyToken = `${encodedPayload}.${yield* signPayload(encodedPayload, secret)}`;
169
+ const legacyToken = `${encodedPayload}.${yield* signer.sign(encodedPayload)}`;
170
171
expect(yield* validateAttachmentUploadToken(legacyToken)).toMatchObject({
172
type: "image",
apps/server/src/assets/AttachmentUpload.ts
+10
-20
@@ -27,20 +27,14 @@ import {
27
sweepStalePendingAttachments,
28
} from "../attachmentStore.ts";
29
import { resolveAttachmentRelativePath } from "../attachmentPaths.ts";
30
-import {
31
- base64UrlDecodeUtf8,
32
- base64UrlEncode,
33
- signPayload,
34
- verifyPayloadSignature,
35
-} from "../auth/utils.ts";
36
-import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
30
+import { base64UrlDecodeUtf8, base64UrlEncode } from "../auth/utils.ts";
31
+import * as AssetSigner from "./AssetSigner.ts";
32
import * as ServerConfig from "../config.ts";
33
import { inferImageExtension } from "../imageMime.ts";
34
import * as DocumentText from "../provider/DocumentText.ts";
35
36
export const ATTACHMENT_UPLOAD_ROUTE_PREFIX = "/api/attachments/upload";
37
43
-const SIGNING_SECRET_NAME = "asset-access-signing-key";
38
const PENDING_ATTACHMENT_SWEEP_INTERVAL_MS = 15 * 60_000;
39
const lastPendingSweepByDirectory = new Map<string, number>();
40
@@ -70,17 +64,9 @@ function decodeClaims(encodedPayload: string): AttachmentUploadClaims | null {
64
}
65
}
66
73
-const loadSigningSecret = Effect.gen(function* () {
74
- const secretStore = yield* ServerSecretStore.ServerSecretStore;
75
- return yield* secretStore.getOrCreateRandom(SIGNING_SECRET_NAME, 32);
76
-});
77
-
67
export const issueAttachmentUploadUrl = Effect.fn("AttachmentUpload.issueUrl")(function* (
68
input: AttachmentCreateUploadUrlInput,
69
) {
81
- const secret = yield* loadSigningSecret.pipe(
82
- Effect.mapError((cause) => new AttachmentUploadSigningKeyError({ cause })),
83
- );
70
const config = yield* ServerConfig.ServerConfig;
71
const nowMs = yield* Clock.currentTimeMillis;
72
const previousSweep = lastPendingSweepByDirectory.get(config.attachmentsDir);
@@ -120,7 +106,10 @@ export const issueAttachmentUploadUrl = Effect.fn("AttachmentUpload.issueUrl")(f
106
}),
107
);
108
123
- const signature = yield* signPayload(encodedPayload, secret);
109
+ const signer = yield* AssetSigner.AssetSigner;
110
+ const signature = yield* signer
111
+ .sign(encodedPayload)
112
+ .pipe(Effect.mapError((cause) => new AttachmentUploadSigningKeyError({ cause })));
113
return {
114
attachmentId,
115
relativeUrl: `${ATTACHMENT_UPLOAD_ROUTE_PREFIX}/${encodedPayload}.${signature}`,
@@ -136,13 +125,14 @@ export const validateAttachmentUploadToken = Effect.fn("AttachmentUpload.validat
125
return null;
126
}
127
139
- const secret = yield* loadSigningSecret.pipe(
128
+ const signer = yield* AssetSigner.AssetSigner;
129
+ const verified = yield* signer.verify(encodedPayload, signature).pipe(
130
Effect.tapError((cause) =>
131
Effect.logError("Failed to load the attachment upload signing key.", { cause }),
132
),
143
- Effect.orElseSucceed(() => null),
133
+ Effect.orElseSucceed(() => false),
134
);
145
- if (!secret || !(yield* verifyPayloadSignature(encodedPayload, signature, secret))) {
135
+ if (!verified) {
136
return null;
137
}
138
apps/server/src/auth/McpOAuth.ts
+6
-14
@@ -23,7 +23,6 @@ import * as Clock from "effect/Clock";
23
import * as Context from "effect/Context";
24
import * as Digest from "effect/crypto/Digest";
25
import * as SecureRandom from "effect/crypto/SecureRandom";
26
-import * as Mac from "effect/crypto/Mac";
26
import * as Effect from "effect/Effect";
27
import * as Layer from "effect/Layer";
28
import * as Option from "effect/Option";
@@ -37,15 +36,14 @@ import * as ServerEnvironment from "../environment/ServerEnvironment.ts";
36
import * as ServerSettings from "../serverSettings.ts";
37
import * as McpHttpServer from "../mcp/McpHttpServer.ts";
38
import type * as McpInvocationContext from "../mcp/McpInvocationContext.ts";
39
+import * as PayloadSigner from "./PayloadSigner.ts";
40
import * as EnvironmentAuth from "./EnvironmentAuth.ts";
41
import * as ServerSecretStore from "./ServerSecretStore.ts";
42
import {
43
base64UrlDecodeUtf8,
44
base64UrlEncode,
45
deriveAuthClientMetadata,
46
- signPayload,
46
timingSafeEqualBase64Url,
48
- verifyPayloadSignature,
47
} from "./utils.ts";
48
import { requestUrl } from "../requestUrl.ts";
49
@@ -263,14 +261,12 @@ const make = Effect.gen(function* () {
261
Effect.map((settings) => settings.linkedEnvironmentsEnabled),
262
Effect.orElseSucceed(() => false),
263
);
266
- const signingKey = yield* secretStore
267
- .getOrCreateRandom(SIGNING_SECRET_NAME, 32)
268
- .pipe(Effect.orDie);
264
+ const signer = yield* PayloadSigner.fromSecret(
265
+ yield* secretStore.getOrCreateRandom(SIGNING_SECRET_NAME, 32).pipe(Effect.orDie),
266
+ );
267
const codes = yield* Ref.make<ReadonlyMap<string, PendingCode>>(new Map());
268
271
- const mac = yield* Mac.Mac;
272
- const sign = (domain: string, payload: string) =>
273
- signPayload(`${domain}.${payload}`, signingKey).pipe(Effect.provideService(Mac.Mac, mac));
269
+ const sign = (domain: string, payload: string) => signer.sign(`${domain}.${payload}`);
270
271
const signClientId = (name: string, redirectUris: ReadonlyArray<string>, peerLink: boolean) => {
272
const body = base64UrlEncode(
@@ -285,11 +281,7 @@ const make = Effect.gen(function* () {
281
): Effect.fn.Return<McpOAuthClient | undefined> {
282
const [body, signature, extra] = clientId.split(".");
283
if (!body || !signature || extra !== undefined) return undefined;
288
- const verified = yield* verifyPayloadSignature(
289
- `mcp-client-id.${body}`,
290
- signature,
291
- signingKey,
292
- ).pipe(Effect.provideService(Mac.Mac, mac));
284
+ const verified = yield* signer.verify(`mcp-client-id.${body}`, signature);
285
if (!verified) return undefined;
286
const json = yield* Effect.try(() => base64UrlDecodeUtf8(body)).pipe(Effect.option);
287
if (Option.isNone(json)) return undefined;
apps/server/src/auth/PayloadSigner.ts
new
+59
@@ -0,0 +1,59 @@
1
+import * as Mac from "effect/crypto/Mac";
2
+import * as Effect from "effect/Effect";
3
+import * as Base64Url from "effect/encoding/Base64Url";
4
+import * as Result from "effect/Result";
5
+
6
+import * as ServerSecretStore from "./ServerSecretStore.ts";
7
+
8
+/** HMAC-SHA256 signatures over UTF-8 payloads, as unpadded base64url. */
9
+export interface PayloadSigner<E = never> {
10
+ readonly sign: (payload: string) => Effect.Effect<string, E>;
11
+ readonly verify: (payload: string, signature: string) => Effect.Effect<boolean, E>;
12
+}
13
+
14
+const utf8 = (value: string) => new TextEncoder().encode(value);
15
+
16
+const fromKey = <E>(mac: Mac.Mac["Service"], key: Effect.Effect<Mac.Key, E>): PayloadSigner<E> => ({
17
+ sign: (payload) =>
18
+ key.pipe(
19
+ Effect.flatMap((loaded) => mac.sign(loaded, utf8(payload)).pipe(Effect.orDie)),
20
+ Effect.map(Base64Url.encode),
21
+ ),
22
+ verify: (payload, signature) => {
23
+ const tag = Base64Url.decode(signature);
24
+ return Result.isFailure(tag)
25
+ ? Effect.succeed(false)
26
+ : key.pipe(
27
+ Effect.flatMap((loaded) =>
28
+ mac.verify(loaded, tag.success, utf8(payload)).pipe(Effect.orDie),
29
+ ),
30
+ );
31
+ },
32
+});
33
+
34
+/** A signer for secret bytes the caller already holds. */
35
+export const fromSecret = Effect.fn("PayloadSigner.fromSecret")(function* (secret: Uint8Array) {
36
+ const mac = yield* Mac.Mac;
37
+ const key = yield* Mac.key(Mac.hmacSha256, secret).pipe(Effect.orDie);
38
+ return fromKey(mac, Effect.succeed(key));
39
+});
40
+
41
+/** A signer keyed by a named server secret, loaded on first use so store failures reach callers. */
42
+export const make = Effect.fn("PayloadSigner.make")(function* (secretName: string) {
43
+ const secrets = yield* ServerSecretStore.ServerSecretStore;
44
+ const mac = yield* Mac.Mac;
45
+ let key: Mac.Key | undefined;
46
+ const loadKey = Effect.suspend(() =>
47
+ key !== undefined
48
+ ? Effect.succeed(key)
49
+ : secrets.getOrCreateRandom(secretName, 32).pipe(
50
+ Effect.flatMap((bytes) => Mac.key(Mac.hmacSha256, bytes).pipe(Effect.orDie)),
51
+ Effect.tap((loaded) =>
52
+ Effect.sync(() => {
53
+ key = loaded;
54
+ }),
55
+ ),
56
+ ),
57
+ );
58
+ return fromKey(mac, loadKey);
59
+});
apps/server/src/auth/SessionStore.test.ts
+6
-5
@@ -19,7 +19,8 @@ import * as ServerEnvironment from "../environment/ServerEnvironment.ts";
19
import * as SqlitePersistence from "../persistence/Sqlite.ts";
20
import * as SessionStore from "./SessionStore.ts";
21
import * as ServerSecretStore from "./ServerSecretStore.ts";
22
-import { base64UrlDecodeUtf8, base64UrlEncode, signPayload } from "./utils.ts";
22
+import { base64UrlDecodeUtf8, base64UrlEncode } from "./utils.ts";
23
+import * as PayloadSigner from "./PayloadSigner.ts";
24
25
const layerServerConfig = (overrides?: Partial<ServerConfig.ServerConfig["Service"]>) =>
26
Layer.effect(
@@ -367,12 +368,12 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("SessionStore.lay
368
const [encodedPayload] = issued.token.split(".");
369
const currentClaims = base64UrlDecodeUtf8(encodedPayload!);
370
expect(currentClaims).toContain('"v":1');
370
- const secret = yield* secrets.getOrCreateRandom("server-signing-key", 32);
371
+ const signer = yield* PayloadSigner.fromSecret(
372
+ yield* secrets.getOrCreateRandom("server-signing-key", 32),
373
+ );
374
const resign = (claims: string) => {
375
const payload = base64UrlEncode(claims);
373
- return signPayload(payload, secret).pipe(
374
- Effect.map((signature) => `${payload}.${signature}`),
375
- );
376
+ return signer.sign(payload).pipe(Effect.map((signature) => `${payload}.${signature}`));
377
};
378
const legacyToken = yield* resign(currentClaims.replace('"v":1', '"v":2'));
379
const editedToken = yield* resign(
apps/server/src/auth/SessionStore.ts
+8
-15
@@ -13,7 +13,6 @@ import * as Context from "effect/Context";
13
import * as SecureRandom from "effect/crypto/SecureRandom";
14
import * as DateTime from "effect/DateTime";
15
import * as Duration from "effect/Duration";
16
-import * as Mac from "effect/crypto/Mac";
16
import * as Effect from "effect/Effect";
17
import * as Layer from "effect/Layer";
18
import * as PubSub from "effect/PubSub";
@@ -25,6 +24,7 @@ import * as Option from "effect/Option";
24
import * as ServerConfig from "../config.ts";
25
import * as ServerEnvironment from "../environment/ServerEnvironment.ts";
26
import * as AuthSessions from "../persistence/AuthSessions.ts";
27
+import * as PayloadSigner from "./PayloadSigner.ts";
28
import * as ServerSecretStore from "./ServerSecretStore.ts";
29
import {
30
REUSABLE_DEV_SESSION_EXPIRES_AT,
@@ -36,8 +36,6 @@ import {
36
base64UrlEncode,
37
resolveLegacySessionCookieName,
38
resolveSessionCookieName,
39
- signPayload,
40
- verifyPayloadSignature,
39
} from "./utils.ts";
40
41
export interface IssuedSession {
@@ -497,14 +495,9 @@ const make = Effect.gen(function* () {
495
const serverEnvironment = yield* ServerEnvironment.ServerEnvironmentIdentity;
496
const secretStore = yield* ServerSecretStore.ServerSecretStore;
497
const authSessions = yield* AuthSessions.AuthSessionRepository;
500
- const signingSecret = yield* secretStore.getOrCreateRandom(SIGNING_SECRET_NAME, 32);
501
- const mac = yield* Mac.Mac;
502
- const sign = (payload: string) =>
503
- signPayload(payload, signingSecret).pipe(Effect.provideService(Mac.Mac, mac));
504
- const verifySignature = (payload: string, signature: string) =>
505
- verifyPayloadSignature(payload, signature, signingSecret).pipe(
506
- Effect.provideService(Mac.Mac, mac),
507
- );
498
+ const signer = yield* PayloadSigner.fromSecret(
499
+ yield* secretStore.getOrCreateRandom(SIGNING_SECRET_NAME, 32),
500
+ );
501
const connectedSessionsRef = yield* Ref.make(new Map<AuthSessionId, number>());
502
const changesPubSub = yield* PubSub.unbounded<SessionCredentialChange>();
503
// Newest session per DPoP key. A live socket moves to it at expiry, so a
@@ -687,7 +680,7 @@ const make = Effect.gen(function* () {
680
}),
681
),
682
);
690
- const signature = yield* sign(encodedPayload);
683
+ const signature = yield* signer.sign(encodedPayload);
684
const client = input?.client ?? createDefaultClientMetadata();
685
const sessionRecord = {
686
sessionId,
@@ -799,7 +792,7 @@ const make = Effect.gen(function* () {
792
return yield* new MalformedSessionTokenError({});
793
}
794
802
- if (!(yield* verifySignature(encodedPayload, signature))) {
795
+ if (!(yield* signer.verify(encodedPayload, signature))) {
796
return yield* new InvalidSessionTokenSignatureError({});
797
}
798
@@ -886,7 +879,7 @@ const make = Effect.gen(function* () {
879
}),
880
),
881
);
889
- const signature = yield* sign(encodedPayload);
882
+ const signature = yield* signer.sign(encodedPayload);
883
return {
884
token: `${encodedPayload}.${signature}`,
885
expiresAt,
@@ -901,7 +894,7 @@ const make = Effect.gen(function* () {
894
return yield* new MalformedWebSocketTokenError({});
895
}
896
904
- if (!(yield* verifySignature(encodedPayload, signature))) {
897
+ if (!(yield* signer.verify(encodedPayload, signature))) {
898
return yield* new InvalidWebSocketTokenSignatureError({});
899
}
900
apps/server/src/auth/utils.ts
-25
@@ -9,7 +9,6 @@ import * as NodeCrypto from "node:crypto";
9
import * as NodeNet from "node:net";
10
import { normalizeHostname } from "@t3tools/shared/hostClassification";
11
import * as Mac from "effect/crypto/Mac";
12
-import * as Effect from "effect/Effect";
12
import * as Base64Url from "effect/encoding/Base64Url";
13
import * as Result from "effect/Result";
14
@@ -81,30 +80,6 @@ export function base64UrlDecodeUtf8(input: string): string {
80
return Result.getOrThrow(Base64Url.decodeString(input));
81
}
82
84
-const hmacKey = (secret: Uint8Array) => Mac.key(Mac.hmacSha256, secret).pipe(Effect.orDie);
85
-
86
-// Untraced: every authenticated request signs or verifies at least one token.
87
-export const signPayload = Effect.fnUntraced(function* (payload: string, secret: Uint8Array) {
88
- const mac = yield* Mac.Mac;
89
- const tag = yield* mac
90
- .sign(yield* hmacKey(secret), new TextEncoder().encode(payload))
91
- .pipe(Effect.orDie);
92
- return Base64Url.encode(tag);
93
-});
94
-
95
-export const verifyPayloadSignature = Effect.fnUntraced(function* (
96
- payload: string,
97
- signature: string,
98
- secret: Uint8Array,
99
-) {
100
- const tag = Base64Url.decode(signature);
101
- if (Result.isFailure(tag)) return false;
102
- const mac = yield* Mac.Mac;
103
- return yield* mac
104
- .verify(yield* hmacKey(secret), tag.success, new TextEncoder().encode(payload))
105
- .pipe(Effect.orDie);
106
-});
107
-
83
export function timingSafeEqualBase64Url(left: string, right: string): boolean {
84
const leftBytes = Base64Url.decode(left);
85
const rightBytes = Base64Url.decode(right);
apps/server/src/guest/GuestShareService.ts
+16
-40
@@ -26,7 +26,6 @@ import * as Context from "effect/Context";
26
import * as SecureRandom from "effect/crypto/SecureRandom";
27
import * as DateTime from "effect/DateTime";
28
import * as Duration from "effect/Duration";
29
-import * as Mac from "effect/crypto/Mac";
29
import * as Effect from "effect/Effect";
30
import * as FileSystem from "effect/FileSystem";
31
import * as Layer from "effect/Layer";
@@ -35,14 +34,8 @@ import * as Schedule from "effect/Schedule";
34
import * as Schema from "effect/Schema";
35
import * as Stream from "effect/Stream";
36
38
-import {
39
- base64UrlDecodeUtf8,
40
- base64UrlEncode,
41
- signPayload,
42
- timingSafeEqualBase64Url,
43
- verifyPayloadSignature,
44
-} from "../auth/utils.ts";
45
-import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
37
+import { base64UrlDecodeUtf8, base64UrlEncode, timingSafeEqualBase64Url } from "../auth/utils.ts";
38
+import * as PayloadSigner from "../auth/PayloadSigner.ts";
39
import {
40
attachmentFileExtension,
41
createAttachmentId,
@@ -143,14 +136,6 @@ const SessionClaims = Schema.Struct({
136
type SessionClaims = typeof SessionClaims.Type;
137
const decodeSessionClaims = Schema.decodeUnknownOption(Schema.fromJsonString(SessionClaims));
138
146
-/** A truncated HMAC keeps invite links short. 128 bits is still far beyond guessing range. */
147
-const inviteSignature = (shareId: string, key: Uint8Array) =>
148
- signPayload(`guest-invite:${shareId}`, key).pipe(
149
- Effect.map((signature) =>
150
- base64UrlEncode(Buffer.from(signature, "base64url").subarray(0, INVITE_SIGNATURE_BYTES)),
151
- ),
152
- );
153
-
139
const inactive = new GuestShareAccessError({ reason: "inactive" });
140
141
export class GuestShareService extends Context.Service<
@@ -241,29 +226,28 @@ const make = Effect.gen(function* () {
226
const { attachmentsDir } = yield* ServerConfig.ServerConfig;
227
const fileSystem = yield* FileSystem.FileSystem;
228
const random = yield* SecureRandom.SecureRandom;
244
- const secretStore = yield* ServerSecretStore.ServerSecretStore;
229
const analytics = yield* AnalyticsService.AnalyticsService;
246
- const mac = yield* Mac.Mac;
247
- const signingKey = yield* Effect.cached(
248
- secretStore.getOrCreateRandom(SIGNING_SECRET_NAME, 32).pipe(Effect.orDie),
249
- );
230
+ const signer = yield* PayloadSigner.make(SIGNING_SECRET_NAME);
231
+ /** A truncated HMAC keeps invite links short. 128 bits is still far beyond guessing range. */
232
+ const inviteSignature = (shareId: string) =>
233
+ signer.sign(`guest-invite:${shareId}`).pipe(
234
+ Effect.orDie,
235
+ Effect.map((signature) =>
236
+ base64UrlEncode(Buffer.from(signature, "base64url").subarray(0, INVITE_SIGNATURE_BYTES)),
237
+ ),
238
+ );
239
240
// Tokens are derived from the share id, so nothing secret is stored and replacing or closing
241
// the share in the thread projection revokes every token for it. An invite is
242
// `<shareId>.<signature>` and the thread is looked up by share id; a session token carries
243
// signed claims.
244
const signInvite = (shareId: GuestShareId) =>
256
- signingKey.pipe(
257
- Effect.flatMap((key) => inviteSignature(shareId, key)),
258
- Effect.map((signature) => `${shareId}.${signature}`),
259
- Effect.provideService(Mac.Mac, mac),
260
- );
245
+ inviteSignature(shareId).pipe(Effect.map((signature) => `${shareId}.${signature}`));
246
const signSession = (claims: SessionClaims) => {
247
const payload = base64UrlEncode(JSON.stringify(claims));
263
- return signingKey.pipe(
264
- Effect.flatMap((key) => signPayload(payload, key)),
248
+ return signer.sign(payload).pipe(
249
+ Effect.orDie,
250
Effect.map((signature) => `${payload}.${signature}`),
266
- Effect.provideService(Mac.Mac, mac),
251
);
252
};
253
const splitToken = (token: string) => {
@@ -273,10 +257,7 @@ const make = Effect.gen(function* () {
257
const verifyInvite = Effect.fn("GuestShareService.verifyInvite")(function* (token: string) {
258
const parts = splitToken(token);
259
if (parts === null) return Option.none<SessionClaims>();
276
- const key = yield* signingKey;
277
- const expected = yield* inviteSignature(parts.payload, key).pipe(
278
- Effect.provideService(Mac.Mac, mac),
279
- );
260
+ const expected = yield* inviteSignature(parts.payload);
261
if (!timingSafeEqualBase64Url(parts.signature, expected)) {
262
return Option.none<SessionClaims>();
263
}
@@ -290,14 +271,9 @@ const make = Effect.gen(function* () {
271
});
272
// Untraced: runs on every guest request, like the Effect.map it replaced.
273
const verifySession = Effect.fnUntraced(function* (token: string) {
293
- const key = yield* signingKey;
274
const parts = splitToken(token);
275
if (parts === null) return Option.none<SessionClaims>();
296
- if (
297
- !(yield* verifyPayloadSignature(parts.payload, parts.signature, key).pipe(
298
- Effect.provideService(Mac.Mac, mac),
299
- ))
300
- ) {
276
+ if (!(yield* signer.verify(parts.payload, parts.signature).pipe(Effect.orDie))) {
277
return Option.none<SessionClaims>();
278
}
279
return decodeSessionClaims(base64UrlDecodeUtf8(parts.payload));
apps/server/src/mcp/toolkits/attachment/handlers.ts
+3
-3
@@ -5,8 +5,8 @@ import {
5
OrchestratorMcpFailure,
6
} from "@t3tools/contracts";
7
import * as Clock from "effect/Clock";
8
-import * as Mac from "effect/crypto/Mac";
8
import * as Effect from "effect/Effect";
9
+import * as AssetSigner from "../../../assets/AssetSigner.ts";
10
import * as McpInvocationContext from "../../McpInvocationContext.ts";
11
import * as Upload from "../../../assets/AttachmentUpload.ts";
12
import * as Claims from "../../../orchestration-v2/AttachmentClaims.ts";
@@ -45,7 +45,7 @@ const uploadOwner = McpInvocationContext.McpInvocationContext.pipe(
45
export const layer = McpToolAccess.toLayer(
46
AttachmentToolkit,
47
Effect.gen(function* () {
48
- const mac = yield* Mac.Mac;
48
+ const assetSigner = yield* AssetSigner.AssetSigner;
49
const uploadOwners = new Map<string, { readonly owner: string; readonly issuedAt: number }>();
50
return {
51
// A pending upload belongs to its caller until a send claims it, so
@@ -54,7 +54,7 @@ export const layer = McpToolAccess.toLayer(
54
(input) =>
55
Effect.gen(function* () {
56
const result = yield* Upload.issueAttachmentUploadUrl(input.upload).pipe(
57
- Effect.provideService(Mac.Mac, mac),
57
+ Effect.provideService(AssetSigner.AssetSigner, assetSigner),
58
Effect.mapError(unavailable),
59
);
60
const now = yield* Clock.currentTimeMillis;
apps/server/src/mcp/toolkits/core.test.ts
+2
-1
@@ -1,3 +1,4 @@
1
+import * as AssetSigner from "../../assets/AssetSigner.ts";
2
import * as DocumentText from "../../provider/DocumentText.ts";
3
import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
4
import * as NodeServices from "@effect/platform-node/NodeServices";
@@ -1014,7 +1015,7 @@ it.effect("only the caller that prepared a pending upload can discard it", () =>
1015
McpHttpServer.layerAttachmentToolkit.pipe(
1016
Layer.provideMerge(McpHttpServer.layerInProcessMcpServer),
1017
Layer.provide(McpToolAccessTestkit.liveThreadsLayer),
1017
- Layer.provide(ServerSecretStore.layer),
1018
+ Layer.provide(AssetSigner.layer.pipe(Layer.provideMerge(ServerSecretStore.layer))),
1019
Layer.provide(ServerConfig.layerTest(process.cwd(), { prefix: "t3-mcp-attachment-" })),
1020
Layer.provide(
1021
DocumentText.layer.pipe(
apps/server/src/provider/AgentContextBudget.test.ts
+2
@@ -7,6 +7,7 @@ import * as Effect from "effect/Effect";
7
import * as Layer from "effect/Layer";
8
import { McpServer } from "effect/ai";
9
10
+import { AssetSigner } from "../assets/AssetSigner.ts";
11
import { ServerSecretStore } from "../auth/ServerSecretStore.ts";
12
import { ServerConfig } from "../config.ts";
13
import { DeviceService } from "../device/DeviceService.ts";
@@ -47,6 +48,7 @@ import budget from "./agentContextBudget.json" with { type: "json" };
48
49
// Registration only stores tool definitions, so the handlers' services are never called.
50
const toolHandlerServices = Layer.mergeAll(
51
+ Layer.mock(AssetSigner)({}),
52
Layer.mock(DeviceService)({}),
53
Layer.mock(DocumentText)({}),
54
Layer.mock(GitVcsDriver)({}),
apps/server/src/server.ts
+2
@@ -1,6 +1,7 @@
1
import * as ProviderEventLoggers from "@t3tools/provider-core/server/ProviderEventLoggers";
2
import type { RelayManagedEndpointRuntimeConfig } from "@t3tools/contracts/relay";
3
import * as Random from "effect/Random";
4
+import * as AssetSigner from "./assets/AssetSigner.ts";
5
import * as DatabaseStorage from "./persistence/DatabaseStorage.ts";
6
import * as StorageCleanup from "./storageCleanup.ts";
7
import * as PullRequestSyncReactor from "./orchestration-v2/PullRequestSyncReactor.ts";
@@ -719,6 +720,7 @@ const layerRuntimeCoreDependencies = layerRuntimeCoreDependenciesBase.pipe(
720
Layer.provideMerge(CodexManagedTokenBroker.layer),
721
Layer.provideMerge(layerServerEnvironment),
722
Layer.provideMerge(layerAuth),
723
+ Layer.provideMerge(AssetSigner.layer),
724
Layer.provideMerge(ServerSecretStore.layer),
725
Layer.provideMerge(
726
Layer.mergeAll(
apps/server/src/ws.test.ts
+2
@@ -35,6 +35,7 @@ import { RpcGroup, RpcMessage, RpcServer } from "effect/rpc";
35
import * as SqlClient from "effect/sql/SqlClient";
36
import * as Statement from "effect/sql/Statement";
37
38
+import * as AssetSigner from "./assets/AssetSigner.ts";
39
import * as PreviewAutomationBroker from "./mcp/PreviewAutomationBroker.ts";
40
import * as ServerBrowser from "./preview/ServerBrowser.ts";
41
import * as AcpRegistryRuntimeCoordinator from "@t3tools/provider-acp-registry/server/AcpRegistryRuntimeCoordinator";
@@ -733,6 +734,7 @@ const layerUnusedConfigRpcServices = Layer.mergeAll(
734
735
const layerConfigSources = Layer.mergeAll(
736
Keybindings.layer,
737
+ AssetSigner.layer.pipe(Layer.provide(ServerSecretStore.layer)),
738
ServerSettings.layer.pipe(
739
Layer.provide(Layer.merge(ServerSecretStore.layer, ManagedPolicy.layerTest())),
740
),