Skip to content
TypeScript

refactor(server): sign server tokens through PayloadSigner (#30523)

Julius Marminge16fc3cc45b38
diff --git a/apps/server/src/assets/AssetAccess.test.ts b/apps/server/src/assets/AssetAccess.test.ts
index 27d1a72e1b2..cc423a14f96 100644
--- a/apps/server/src/assets/AssetAccess.test.ts
+++ b/apps/server/src/assets/AssetAccess.test.ts
@@ -25,6 +25,7 @@ import * as TestClock from "effect/testing/TestClock";
import { HttpClientRequest, HttpClientResponse, HttpServerResponse } from "effect/http";
import { vi } from "vite-plus/test";
+import * as AssetSigner from "./AssetSigner.ts";
import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
import * as ServerConfig from "../config.ts";
import * as Orchestrator from "../orchestration-v2/Orchestrator.ts";
@@ -119,7 +120,9 @@ const layerTest = Layer.mergeAll(
Layer.provide(T3ProjectFileLoader.layer),
),
NativeAppIconResolver.layer.pipe(Layer.provide(layerConfig)),
- ServerSecretStore.layer.pipe(Layer.provide(layerConfig)),
+ AssetSigner.layer.pipe(
+ Layer.provideMerge(ServerSecretStore.layer.pipe(Layer.provide(layerConfig))),
+ ),
).pipe(Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)));
describe("AssetAccess", () => {
diff --git a/apps/server/src/assets/AssetAccess.ts b/apps/server/src/assets/AssetAccess.ts
index 47f4b75f832..bbaa3f5c1f8 100644
--- a/apps/server/src/assets/AssetAccess.ts
+++ b/apps/server/src/assets/AssetAccess.ts
@@ -47,13 +47,8 @@ import * as Path from "effect/Path";
import * as Schema from "effect/Schema";
import * as Stream from "effect/Stream";
-import {
- base64UrlDecodeUtf8,
- base64UrlEncode,
- signPayload,
- verifyPayloadSignature,
-} from "../auth/utils.ts";
-import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
+import { base64UrlDecodeUtf8, base64UrlEncode } from "../auth/utils.ts";
+import * as AssetSigner from "./AssetSigner.ts";
import { makeIsServerInternalPath } from "../auth/serverInternalPaths.ts";
import { parseAttachmentFileExtension, resolveAttachmentPathById } from "../attachmentStore.ts";
import * as ServerConfig from "../config.ts";
@@ -70,7 +65,6 @@ import * as HostProcess from "@t3tools/shared/HostProcess";
export const ASSET_ROUTE_PREFIX = "/api/assets";
-const SIGNING_SECRET_NAME = "asset-access-signing-key";
const ASSET_TOKEN_TTL_MS = 60 * 60 * 1000;
const PROJECT_FAVICON_TOKEN_BUCKET_MS = 30 * 60 * 1000;
const HTML_ATTACHMENT_TOKEN_BUCKET_MS = 30 * 60 * 1000;
@@ -848,16 +842,6 @@ export const issueAssetUrl = Effect.fn("AssetAccess.issueAssetUrl")(function* (i
}
}
- const secretStore = yield* ServerSecretStore.ServerSecretStore;
- const signingSecret = yield* secretStore.getOrCreateRandom(SIGNING_SECRET_NAME, 32).pipe(
- Effect.mapError(
- (cause) =>
- new AssetSigningKeyLoadError({
- resource: input.resource,
- cause,
- }),
- ),
- );
if (claims.kind === "project-favicon" || claims.kind === "project-favicon-external") {
const issuedAt = yield* Clock.currentTimeMillis;
expiresAt =
@@ -872,7 +856,13 @@ export const issueAssetUrl = Effect.fn("AssetAccess.issueAssetUrl")(function* (i
claims = { ...claims, expiresAt };
}
const encodedPayload = base64UrlEncode(encodeAssetClaims(claims));
- const token = `${encodedPayload}.${yield* signPayload(encodedPayload, signingSecret)}`;
+ const signer = yield* AssetSigner.AssetSigner;
+ const signature = yield* signer
+ .sign(encodedPayload)
+ .pipe(
+ Effect.mapError((cause) => new AssetSigningKeyLoadError({ resource: input.resource, cause })),
+ );
+ const token = `${encodedPayload}.${signature}`;
return {
relativeUrl: `${ASSET_ROUTE_PREFIX}/${token}/${encodeURIComponent(fileName)}`,
expiresAt,
@@ -889,13 +879,12 @@ export const resolveAsset = Effect.fn("AssetAccess.resolveAsset")(function* (
const [encodedPayload, signature] = token.split(".");
if (!encodedPayload || !signature) return null;
- const secretStore = yield* ServerSecretStore.ServerSecretStore;
- const signingSecret = yield* secretStore.getOrCreateRandom(SIGNING_SECRET_NAME, 32).pipe(
+ const signer = yield* AssetSigner.AssetSigner;
+ const verified = yield* signer.verify(encodedPayload, signature).pipe(
Effect.tapError((cause) => Effect.logError("Failed to load the asset signing key.", { cause })),
- Effect.orElseSucceed(() => null),
+ Effect.orElseSucceed(() => false),
);
- if (!signingSecret) return null;
- if (!(yield* verifyPayloadSignature(encodedPayload, signature, signingSecret))) return null;
+ if (!verified) return null;
const claims = decodeClaims(encodedPayload);
if (!claims || claims.expiresAt <= (yield* Clock.currentTimeMillis)) return null;
diff --git a/apps/server/src/assets/AssetSigner.ts b/apps/server/src/assets/AssetSigner.ts
new file mode 100644
index 00000000000..b113ee55593
--- /dev/null
+++ b/apps/server/src/assets/AssetSigner.ts
@@ -0,0 +1,13 @@
+import * as Context from "effect/Context";
+import * as Layer from "effect/Layer";
+
+import * as PayloadSigner from "../auth/PayloadSigner.ts";
+import type * as ServerSecretStore from "../auth/ServerSecretStore.ts";
+
+/** Signs asset and attachment-upload URLs; both share one key. */
+export class AssetSigner extends Context.Service<
+ AssetSigner,
+ PayloadSigner.PayloadSigner<ServerSecretStore.SecretStoreError>
+>()("t3/assets/AssetSigner") {}
+
+export const layer = Layer.effect(AssetSigner, PayloadSigner.make("asset-access-signing-key"));
diff --git a/apps/server/src/assets/AttachmentUpload.test.ts b/apps/server/src/assets/AttachmentUpload.test.ts
index ac59683688b..9e13ce882ca 100644
--- a/apps/server/src/assets/AttachmentUpload.test.ts
+++ b/apps/server/src/assets/AttachmentUpload.test.ts
@@ -1,3 +1,4 @@
+import * as AssetSigner from "./AssetSigner.ts";
import * as DocumentText from "../provider/DocumentText.ts";
// @effect-diagnostics nodeBuiltinImport:off
import * as NodeFS from "node:fs";
@@ -17,7 +18,7 @@ import * as Schema from "effect/Schema";
import * as Stream from "effect/Stream";
import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
-import { base64UrlEncode, signPayload } from "../auth/utils.ts";
+import { base64UrlEncode } from "../auth/utils.ts";
import * as ServerConfig from "../config.ts";
import {
claimPendingAttachments,
@@ -31,7 +32,8 @@ import {
validateAttachmentUploadToken,
} from "./AttachmentUpload.ts";
-const layerTest = ServerSecretStore.layer.pipe(
+const layerTest = AssetSigner.layer.pipe(
+ Layer.provideMerge(ServerSecretStore.layer),
Layer.provideMerge(ServerConfig.layerTest(process.cwd(), { prefix: "t3-attachment-upload-" })),
Layer.provideMerge(
DocumentText.layer.pipe(
@@ -152,8 +154,7 @@ describe("AttachmentUpload", () => {
it.effect("accepts unexpired image upload tokens issued before file support", () =>
Effect.gen(function* () {
const issued = yield* issueAttachmentUploadUrl(uploadInput);
- const secretStore = yield* ServerSecretStore.ServerSecretStore;
- const secret = yield* secretStore.getOrCreateRandom("asset-access-signing-key", 32);
+ const signer = yield* AssetSigner.AssetSigner;
const encodedPayload = base64UrlEncode(
yield* encodeLegacyAttachmentUploadClaims({
version: 1,
@@ -165,7 +166,7 @@ describe("AttachmentUpload", () => {
expiresAt: issued.expiresAt,
}),
);
- const legacyToken = `${encodedPayload}.${yield* signPayload(encodedPayload, secret)}`;
+ const legacyToken = `${encodedPayload}.${yield* signer.sign(encodedPayload)}`;
expect(yield* validateAttachmentUploadToken(legacyToken)).toMatchObject({
type: "image",
diff --git a/apps/server/src/assets/AttachmentUpload.ts b/apps/server/src/assets/AttachmentUpload.ts
index de1be7eacd2..4732e01abea 100644
--- a/apps/server/src/assets/AttachmentUpload.ts
+++ b/apps/server/src/assets/AttachmentUpload.ts
@@ -27,20 +27,14 @@ import {
sweepStalePendingAttachments,
} from "../attachmentStore.ts";
import { resolveAttachmentRelativePath } from "../attachmentPaths.ts";
-import {
- base64UrlDecodeUtf8,
- base64UrlEncode,
- signPayload,
- verifyPayloadSignature,
-} from "../auth/utils.ts";
-import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
+import { base64UrlDecodeUtf8, base64UrlEncode } from "../auth/utils.ts";
+import * as AssetSigner from "./AssetSigner.ts";
import * as ServerConfig from "../config.ts";
import { inferImageExtension } from "../imageMime.ts";
import * as DocumentText from "../provider/DocumentText.ts";
export const ATTACHMENT_UPLOAD_ROUTE_PREFIX = "/api/attachments/upload";
-const SIGNING_SECRET_NAME = "asset-access-signing-key";
const PENDING_ATTACHMENT_SWEEP_INTERVAL_MS = 15 * 60_000;
const lastPendingSweepByDirectory = new Map<string, number>();
@@ -70,17 +64,9 @@ function decodeClaims(encodedPayload: string): AttachmentUploadClaims | null {
}
}
-const loadSigningSecret = Effect.gen(function* () {
- const secretStore = yield* ServerSecretStore.ServerSecretStore;
- return yield* secretStore.getOrCreateRandom(SIGNING_SECRET_NAME, 32);
-});
-
export const issueAttachmentUploadUrl = Effect.fn("AttachmentUpload.issueUrl")(function* (
input: AttachmentCreateUploadUrlInput,
) {
- const secret = yield* loadSigningSecret.pipe(
- Effect.mapError((cause) => new AttachmentUploadSigningKeyError({ cause })),
- );
const config = yield* ServerConfig.ServerConfig;
const nowMs = yield* Clock.currentTimeMillis;
const previousSweep = lastPendingSweepByDirectory.get(config.attachmentsDir);
@@ -120,7 +106,10 @@ export const issueAttachmentUploadUrl = Effect.fn("AttachmentUpload.issueUrl")(f
}),
);
- const signature = yield* signPayload(encodedPayload, secret);
+ const signer = yield* AssetSigner.AssetSigner;
+ const signature = yield* signer
+ .sign(encodedPayload)
+ .pipe(Effect.mapError((cause) => new AttachmentUploadSigningKeyError({ cause })));
return {
attachmentId,
relativeUrl: `${ATTACHMENT_UPLOAD_ROUTE_PREFIX}/${encodedPayload}.${signature}`,
@@ -136,13 +125,14 @@ export const validateAttachmentUploadToken = Effect.fn("AttachmentUpload.validat
return null;
}
- const secret = yield* loadSigningSecret.pipe(
+ const signer = yield* AssetSigner.AssetSigner;
+ const verified = yield* signer.verify(encodedPayload, signature).pipe(
Effect.tapError((cause) =>
Effect.logError("Failed to load the attachment upload signing key.", { cause }),
),
- Effect.orElseSucceed(() => null),
+ Effect.orElseSucceed(() => false),
);
- if (!secret || !(yield* verifyPayloadSignature(encodedPayload, signature, secret))) {
+ if (!verified) {
return null;
}
diff --git a/apps/server/src/auth/McpOAuth.ts b/apps/server/src/auth/McpOAuth.ts
index 9c7d05b7dfa..bc89ab9fd29 100644
--- a/apps/server/src/auth/McpOAuth.ts
+++ b/apps/server/src/auth/McpOAuth.ts
@@ -23,7 +23,6 @@ import * as Clock from "effect/Clock";
import * as Context from "effect/Context";
import * as Digest from "effect/crypto/Digest";
import * as SecureRandom from "effect/crypto/SecureRandom";
-import * as Mac from "effect/crypto/Mac";
import * as Effect from "effect/Effect";
import * as Layer from "effect/Layer";
import * as Option from "effect/Option";
@@ -37,15 +36,14 @@ import * as ServerEnvironment from "../environment/ServerEnvironment.ts";
import * as ServerSettings from "../serverSettings.ts";
import * as McpHttpServer from "../mcp/McpHttpServer.ts";
import type * as McpInvocationContext from "../mcp/McpInvocationContext.ts";
+import * as PayloadSigner from "./PayloadSigner.ts";
import * as EnvironmentAuth from "./EnvironmentAuth.ts";
import * as ServerSecretStore from "./ServerSecretStore.ts";
import {
base64UrlDecodeUtf8,
base64UrlEncode,
deriveAuthClientMetadata,
- signPayload,
timingSafeEqualBase64Url,
- verifyPayloadSignature,
} from "./utils.ts";
import { requestUrl } from "../requestUrl.ts";
@@ -263,14 +261,12 @@ const make = Effect.gen(function* () {
Effect.map((settings) => settings.linkedEnvironmentsEnabled),
Effect.orElseSucceed(() => false),
);
- const signingKey = yield* secretStore
- .getOrCreateRandom(SIGNING_SECRET_NAME, 32)
- .pipe(Effect.orDie);
+ const signer = yield* PayloadSigner.fromSecret(
+ yield* secretStore.getOrCreateRandom(SIGNING_SECRET_NAME, 32).pipe(Effect.orDie),
+ );
const codes = yield* Ref.make<ReadonlyMap<string, PendingCode>>(new Map());
- const mac = yield* Mac.Mac;
- const sign = (domain: string, payload: string) =>
- signPayload(`${domain}.${payload}`, signingKey).pipe(Effect.provideService(Mac.Mac, mac));
+ const sign = (domain: string, payload: string) => signer.sign(`${domain}.${payload}`);
const signClientId = (name: string, redirectUris: ReadonlyArray<string>, peerLink: boolean) => {
const body = base64UrlEncode(
@@ -285,11 +281,7 @@ const make = Effect.gen(function* () {
): Effect.fn.Return<McpOAuthClient | undefined> {
const [body, signature, extra] = clientId.split(".");
if (!body || !signature || extra !== undefined) return undefined;
- const verified = yield* verifyPayloadSignature(
- `mcp-client-id.${body}`,
- signature,
- signingKey,
- ).pipe(Effect.provideService(Mac.Mac, mac));
+ const verified = yield* signer.verify(`mcp-client-id.${body}`, signature);
if (!verified) return undefined;
const json = yield* Effect.try(() => base64UrlDecodeUtf8(body)).pipe(Effect.option);
if (Option.isNone(json)) return undefined;
diff --git a/apps/server/src/auth/PayloadSigner.ts b/apps/server/src/auth/PayloadSigner.ts
new file mode 100644
index 00000000000..6136f965d79
--- /dev/null
+++ b/apps/server/src/auth/PayloadSigner.ts
@@ -0,0 +1,59 @@
+import * as Mac from "effect/crypto/Mac";
+import * as Effect from "effect/Effect";
+import * as Base64Url from "effect/encoding/Base64Url";
+import * as Result from "effect/Result";
+
+import * as ServerSecretStore from "./ServerSecretStore.ts";
+
+/** HMAC-SHA256 signatures over UTF-8 payloads, as unpadded base64url. */
+export interface PayloadSigner<E = never> {
+ readonly sign: (payload: string) => Effect.Effect<string, E>;
+ readonly verify: (payload: string, signature: string) => Effect.Effect<boolean, E>;
+}
+
+const utf8 = (value: string) => new TextEncoder().encode(value);
+
+const fromKey = <E>(mac: Mac.Mac["Service"], key: Effect.Effect<Mac.Key, E>): PayloadSigner<E> => ({
+ sign: (payload) =>
+ key.pipe(
+ Effect.flatMap((loaded) => mac.sign(loaded, utf8(payload)).pipe(Effect.orDie)),
+ Effect.map(Base64Url.encode),
+ ),
+ verify: (payload, signature) => {
+ const tag = Base64Url.decode(signature);
+ return Result.isFailure(tag)
+ ? Effect.succeed(false)
+ : key.pipe(
+ Effect.flatMap((loaded) =>
+ mac.verify(loaded, tag.success, utf8(payload)).pipe(Effect.orDie),
+ ),
+ );
+ },
+});
+
+/** A signer for secret bytes the caller already holds. */
+export const fromSecret = Effect.fn("PayloadSigner.fromSecret")(function* (secret: Uint8Array) {
+ const mac = yield* Mac.Mac;
+ const key = yield* Mac.key(Mac.hmacSha256, secret).pipe(Effect.orDie);
+ return fromKey(mac, Effect.succeed(key));
+});
+
+/** A signer keyed by a named server secret, loaded on first use so store failures reach callers. */
+export const make = Effect.fn("PayloadSigner.make")(function* (secretName: string) {
+ const secrets = yield* ServerSecretStore.ServerSecretStore;
+ const mac = yield* Mac.Mac;
+ let key: Mac.Key | undefined;
+ const loadKey = Effect.suspend(() =>
+ key !== undefined
+ ? Effect.succeed(key)
+ : secrets.getOrCreateRandom(secretName, 32).pipe(
+ Effect.flatMap((bytes) => Mac.key(Mac.hmacSha256, bytes).pipe(Effect.orDie)),
+ Effect.tap((loaded) =>
+ Effect.sync(() => {
+ key = loaded;
+ }),
+ ),
+ ),
+ );
+ return fromKey(mac, loadKey);
+});
diff --git a/apps/server/src/auth/SessionStore.test.ts b/apps/server/src/auth/SessionStore.test.ts
index 919fcb118e1..b224112168b 100644
--- a/apps/server/src/auth/SessionStore.test.ts
+++ b/apps/server/src/auth/SessionStore.test.ts
@@ -19,7 +19,8 @@ import * as ServerEnvironment from "../environment/ServerEnvironment.ts";
import * as SqlitePersistence from "../persistence/Sqlite.ts";
import * as SessionStore from "./SessionStore.ts";
import * as ServerSecretStore from "./ServerSecretStore.ts";
-import { base64UrlDecodeUtf8, base64UrlEncode, signPayload } from "./utils.ts";
+import { base64UrlDecodeUtf8, base64UrlEncode } from "./utils.ts";
+import * as PayloadSigner from "./PayloadSigner.ts";
const layerServerConfig = (overrides?: Partial<ServerConfig.ServerConfig["Service"]>) =>
Layer.effect(
@@ -367,12 +368,12 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("SessionStore.lay
const [encodedPayload] = issued.token.split(".");
const currentClaims = base64UrlDecodeUtf8(encodedPayload!);
expect(currentClaims).toContain('"v":1');
- const secret = yield* secrets.getOrCreateRandom("server-signing-key", 32);
+ const signer = yield* PayloadSigner.fromSecret(
+ yield* secrets.getOrCreateRandom("server-signing-key", 32),
+ );
const resign = (claims: string) => {
const payload = base64UrlEncode(claims);
- return signPayload(payload, secret).pipe(
- Effect.map((signature) => `${payload}.${signature}`),
- );
+ return signer.sign(payload).pipe(Effect.map((signature) => `${payload}.${signature}`));
};
const legacyToken = yield* resign(currentClaims.replace('"v":1', '"v":2'));
const editedToken = yield* resign(
diff --git a/apps/server/src/auth/SessionStore.ts b/apps/server/src/auth/SessionStore.ts
index 61d4355d920..5a25d152c51 100644
--- a/apps/server/src/auth/SessionStore.ts
+++ b/apps/server/src/auth/SessionStore.ts
@@ -13,7 +13,6 @@ import * as Context from "effect/Context";
import * as SecureRandom from "effect/crypto/SecureRandom";
import * as DateTime from "effect/DateTime";
import * as Duration from "effect/Duration";
-import * as Mac from "effect/crypto/Mac";
import * as Effect from "effect/Effect";
import * as Layer from "effect/Layer";
import * as PubSub from "effect/PubSub";
@@ -25,6 +24,7 @@ import * as Option from "effect/Option";
import * as ServerConfig from "../config.ts";
import * as ServerEnvironment from "../environment/ServerEnvironment.ts";
import * as AuthSessions from "../persistence/AuthSessions.ts";
+import * as PayloadSigner from "./PayloadSigner.ts";
import * as ServerSecretStore from "./ServerSecretStore.ts";
import {
REUSABLE_DEV_SESSION_EXPIRES_AT,
@@ -36,8 +36,6 @@ import {
base64UrlEncode,
resolveLegacySessionCookieName,
resolveSessionCookieName,
- signPayload,
- verifyPayloadSignature,
} from "./utils.ts";
export interface IssuedSession {
@@ -497,14 +495,9 @@ const make = Effect.gen(function* () {
const serverEnvironment = yield* ServerEnvironment.ServerEnvironmentIdentity;
const secretStore = yield* ServerSecretStore.ServerSecretStore;
const authSessions = yield* AuthSessions.AuthSessionRepository;
- const signingSecret = yield* secretStore.getOrCreateRandom(SIGNING_SECRET_NAME, 32);
- const mac = yield* Mac.Mac;
- const sign = (payload: string) =>
- signPayload(payload, signingSecret).pipe(Effect.provideService(Mac.Mac, mac));
- const verifySignature = (payload: string, signature: string) =>
- verifyPayloadSignature(payload, signature, signingSecret).pipe(
- Effect.provideService(Mac.Mac, mac),
- );
+ const signer = yield* PayloadSigner.fromSecret(
+ yield* secretStore.getOrCreateRandom(SIGNING_SECRET_NAME, 32),
+ );
const connectedSessionsRef = yield* Ref.make(new Map<AuthSessionId, number>());
const changesPubSub = yield* PubSub.unbounded<SessionCredentialChange>();
// Newest session per DPoP key. A live socket moves to it at expiry, so a
@@ -687,7 +680,7 @@ const make = Effect.gen(function* () {
}),
),
);
- const signature = yield* sign(encodedPayload);
+ const signature = yield* signer.sign(encodedPayload);
const client = input?.client ?? createDefaultClientMetadata();
const sessionRecord = {
sessionId,
@@ -799,7 +792,7 @@ const make = Effect.gen(function* () {
return yield* new MalformedSessionTokenError({});
}
- if (!(yield* verifySignature(encodedPayload, signature))) {
+ if (!(yield* signer.verify(encodedPayload, signature))) {
return yield* new InvalidSessionTokenSignatureError({});
}
@@ -886,7 +879,7 @@ const make = Effect.gen(function* () {
}),
),
);
- const signature = yield* sign(encodedPayload);
+ const signature = yield* signer.sign(encodedPayload);
return {
token: `${encodedPayload}.${signature}`,
expiresAt,
@@ -901,7 +894,7 @@ const make = Effect.gen(function* () {
return yield* new MalformedWebSocketTokenError({});
}
- if (!(yield* verifySignature(encodedPayload, signature))) {
+ if (!(yield* signer.verify(encodedPayload, signature))) {
return yield* new InvalidWebSocketTokenSignatureError({});
}
diff --git a/apps/server/src/auth/utils.ts b/apps/server/src/auth/utils.ts
index 986baff06dd..c1b8dc92fbe 100644
--- a/apps/server/src/auth/utils.ts
+++ b/apps/server/src/auth/utils.ts
@@ -9,7 +9,6 @@ import * as NodeCrypto from "node:crypto";
import * as NodeNet from "node:net";
import { normalizeHostname } from "@t3tools/shared/hostClassification";
import * as Mac from "effect/crypto/Mac";
-import * as Effect from "effect/Effect";
import * as Base64Url from "effect/encoding/Base64Url";
import * as Result from "effect/Result";
@@ -81,30 +80,6 @@ export function base64UrlDecodeUtf8(input: string): string {
return Result.getOrThrow(Base64Url.decodeString(input));
}
-const hmacKey = (secret: Uint8Array) => Mac.key(Mac.hmacSha256, secret).pipe(Effect.orDie);
-
-// Untraced: every authenticated request signs or verifies at least one token.
-export const signPayload = Effect.fnUntraced(function* (payload: string, secret: Uint8Array) {
- const mac = yield* Mac.Mac;
- const tag = yield* mac
- .sign(yield* hmacKey(secret), new TextEncoder().encode(payload))
- .pipe(Effect.orDie);
- return Base64Url.encode(tag);
-});
-
-export const verifyPayloadSignature = Effect.fnUntraced(function* (
- payload: string,
- signature: string,
- secret: Uint8Array,
-) {
- const tag = Base64Url.decode(signature);
- if (Result.isFailure(tag)) return false;
- const mac = yield* Mac.Mac;
- return yield* mac
- .verify(yield* hmacKey(secret), tag.success, new TextEncoder().encode(payload))
- .pipe(Effect.orDie);
-});
-
export function timingSafeEqualBase64Url(left: string, right: string): boolean {
const leftBytes = Base64Url.decode(left);
const rightBytes = Base64Url.decode(right);
diff --git a/apps/server/src/guest/GuestShareService.ts b/apps/server/src/guest/GuestShareService.ts
index 637b19a9ac9..75c4962f3cb 100644
--- a/apps/server/src/guest/GuestShareService.ts
+++ b/apps/server/src/guest/GuestShareService.ts
@@ -26,7 +26,6 @@ import * as Context from "effect/Context";
import * as SecureRandom from "effect/crypto/SecureRandom";
import * as DateTime from "effect/DateTime";
import * as Duration from "effect/Duration";
-import * as Mac from "effect/crypto/Mac";
import * as Effect from "effect/Effect";
import * as FileSystem from "effect/FileSystem";
import * as Layer from "effect/Layer";
@@ -35,14 +34,8 @@ import * as Schedule from "effect/Schedule";
import * as Schema from "effect/Schema";
import * as Stream from "effect/Stream";
-import {
- base64UrlDecodeUtf8,
- base64UrlEncode,
- signPayload,
- timingSafeEqualBase64Url,
- verifyPayloadSignature,
-} from "../auth/utils.ts";
-import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
+import { base64UrlDecodeUtf8, base64UrlEncode, timingSafeEqualBase64Url } from "../auth/utils.ts";
+import * as PayloadSigner from "../auth/PayloadSigner.ts";
import {
attachmentFileExtension,
createAttachmentId,
@@ -143,14 +136,6 @@ const SessionClaims = Schema.Struct({
type SessionClaims = typeof SessionClaims.Type;
const decodeSessionClaims = Schema.decodeUnknownOption(Schema.fromJsonString(SessionClaims));
-/** A truncated HMAC keeps invite links short. 128 bits is still far beyond guessing range. */
-const inviteSignature = (shareId: string, key: Uint8Array) =>
- signPayload(`guest-invite:${shareId}`, key).pipe(
- Effect.map((signature) =>
- base64UrlEncode(Buffer.from(signature, "base64url").subarray(0, INVITE_SIGNATURE_BYTES)),
- ),
- );
-
const inactive = new GuestShareAccessError({ reason: "inactive" });
export class GuestShareService extends Context.Service<
@@ -241,29 +226,28 @@ const make = Effect.gen(function* () {
const { attachmentsDir } = yield* ServerConfig.ServerConfig;
const fileSystem = yield* FileSystem.FileSystem;
const random = yield* SecureRandom.SecureRandom;
- const secretStore = yield* ServerSecretStore.ServerSecretStore;
const analytics = yield* AnalyticsService.AnalyticsService;
- const mac = yield* Mac.Mac;
- const signingKey = yield* Effect.cached(
- secretStore.getOrCreateRandom(SIGNING_SECRET_NAME, 32).pipe(Effect.orDie),
- );
+ const signer = yield* PayloadSigner.make(SIGNING_SECRET_NAME);
+ /** A truncated HMAC keeps invite links short. 128 bits is still far beyond guessing range. */
+ const inviteSignature = (shareId: string) =>
+ signer.sign(`guest-invite:${shareId}`).pipe(
+ Effect.orDie,
+ Effect.map((signature) =>
+ base64UrlEncode(Buffer.from(signature, "base64url").subarray(0, INVITE_SIGNATURE_BYTES)),
+ ),
+ );
// Tokens are derived from the share id, so nothing secret is stored and replacing or closing
// the share in the thread projection revokes every token for it. An invite is
// `<shareId>.<signature>` and the thread is looked up by share id; a session token carries
// signed claims.
const signInvite = (shareId: GuestShareId) =>
- signingKey.pipe(
- Effect.flatMap((key) => inviteSignature(shareId, key)),
- Effect.map((signature) => `${shareId}.${signature}`),
- Effect.provideService(Mac.Mac, mac),
- );
+ inviteSignature(shareId).pipe(Effect.map((signature) => `${shareId}.${signature}`));
const signSession = (claims: SessionClaims) => {
const payload = base64UrlEncode(JSON.stringify(claims));
- return signingKey.pipe(
- Effect.flatMap((key) => signPayload(payload, key)),
+ return signer.sign(payload).pipe(
+ Effect.orDie,
Effect.map((signature) => `${payload}.${signature}`),
- Effect.provideService(Mac.Mac, mac),
);
};
const splitToken = (token: string) => {
@@ -273,10 +257,7 @@ const make = Effect.gen(function* () {
const verifyInvite = Effect.fn("GuestShareService.verifyInvite")(function* (token: string) {
const parts = splitToken(token);
if (parts === null) return Option.none<SessionClaims>();
- const key = yield* signingKey;
- const expected = yield* inviteSignature(parts.payload, key).pipe(
- Effect.provideService(Mac.Mac, mac),
- );
+ const expected = yield* inviteSignature(parts.payload);
if (!timingSafeEqualBase64Url(parts.signature, expected)) {
return Option.none<SessionClaims>();
}
@@ -290,14 +271,9 @@ const make = Effect.gen(function* () {
});
// Untraced: runs on every guest request, like the Effect.map it replaced.
const verifySession = Effect.fnUntraced(function* (token: string) {
- const key = yield* signingKey;
const parts = splitToken(token);
if (parts === null) return Option.none<SessionClaims>();
- if (
- !(yield* verifyPayloadSignature(parts.payload, parts.signature, key).pipe(
- Effect.provideService(Mac.Mac, mac),
- ))
- ) {
+ if (!(yield* signer.verify(parts.payload, parts.signature).pipe(Effect.orDie))) {
return Option.none<SessionClaims>();
}
return decodeSessionClaims(base64UrlDecodeUtf8(parts.payload));
diff --git a/apps/server/src/mcp/toolkits/attachment/handlers.ts b/apps/server/src/mcp/toolkits/attachment/handlers.ts
index df451763a8e..8d72943f337 100644
--- a/apps/server/src/mcp/toolkits/attachment/handlers.ts
+++ b/apps/server/src/mcp/toolkits/attachment/handlers.ts
@@ -5,8 +5,8 @@ import {
OrchestratorMcpFailure,
} from "@t3tools/contracts";
import * as Clock from "effect/Clock";
-import * as Mac from "effect/crypto/Mac";
import * as Effect from "effect/Effect";
+import * as AssetSigner from "../../../assets/AssetSigner.ts";
import * as McpInvocationContext from "../../McpInvocationContext.ts";
import * as Upload from "../../../assets/AttachmentUpload.ts";
import * as Claims from "../../../orchestration-v2/AttachmentClaims.ts";
@@ -45,7 +45,7 @@ const uploadOwner = McpInvocationContext.McpInvocationContext.pipe(
export const layer = McpToolAccess.toLayer(
AttachmentToolkit,
Effect.gen(function* () {
- const mac = yield* Mac.Mac;
+ const assetSigner = yield* AssetSigner.AssetSigner;
const uploadOwners = new Map<string, { readonly owner: string; readonly issuedAt: number }>();
return {
// A pending upload belongs to its caller until a send claims it, so
@@ -54,7 +54,7 @@ export const layer = McpToolAccess.toLayer(
(input) =>
Effect.gen(function* () {
const result = yield* Upload.issueAttachmentUploadUrl(input.upload).pipe(
- Effect.provideService(Mac.Mac, mac),
+ Effect.provideService(AssetSigner.AssetSigner, assetSigner),
Effect.mapError(unavailable),
);
const now = yield* Clock.currentTimeMillis;
diff --git a/apps/server/src/mcp/toolkits/core.test.ts b/apps/server/src/mcp/toolkits/core.test.ts
index 38beeff5e26..60203129076 100644
--- a/apps/server/src/mcp/toolkits/core.test.ts
+++ b/apps/server/src/mcp/toolkits/core.test.ts
@@ -1,3 +1,4 @@
+import * as AssetSigner from "../../assets/AssetSigner.ts";
import * as DocumentText from "../../provider/DocumentText.ts";
import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
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", () =>
McpHttpServer.layerAttachmentToolkit.pipe(
Layer.provideMerge(McpHttpServer.layerInProcessMcpServer),
Layer.provide(McpToolAccessTestkit.liveThreadsLayer),
- Layer.provide(ServerSecretStore.layer),
+ Layer.provide(AssetSigner.layer.pipe(Layer.provideMerge(ServerSecretStore.layer))),
Layer.provide(ServerConfig.layerTest(process.cwd(), { prefix: "t3-mcp-attachment-" })),
Layer.provide(
DocumentText.layer.pipe(
diff --git a/apps/server/src/provider/AgentContextBudget.test.ts b/apps/server/src/provider/AgentContextBudget.test.ts
index 08bfd011514..8cdd52d202f 100644
--- a/apps/server/src/provider/AgentContextBudget.test.ts
+++ b/apps/server/src/provider/AgentContextBudget.test.ts
@@ -7,6 +7,7 @@ import * as Effect from "effect/Effect";
import * as Layer from "effect/Layer";
import { McpServer } from "effect/ai";
+import { AssetSigner } from "../assets/AssetSigner.ts";
import { ServerSecretStore } from "../auth/ServerSecretStore.ts";
import { ServerConfig } from "../config.ts";
import { DeviceService } from "../device/DeviceService.ts";
@@ -47,6 +48,7 @@ import budget from "./agentContextBudget.json" with { type: "json" };
// Registration only stores tool definitions, so the handlers' services are never called.
const toolHandlerServices = Layer.mergeAll(
+ Layer.mock(AssetSigner)({}),
Layer.mock(DeviceService)({}),
Layer.mock(DocumentText)({}),
Layer.mock(GitVcsDriver)({}),
diff --git a/apps/server/src/server.ts b/apps/server/src/server.ts
index 395afcf5663..9a5cf6c391b 100644
--- a/apps/server/src/server.ts
+++ b/apps/server/src/server.ts
@@ -1,6 +1,7 @@
import * as ProviderEventLoggers from "@t3tools/provider-core/server/ProviderEventLoggers";
import type { RelayManagedEndpointRuntimeConfig } from "@t3tools/contracts/relay";
import * as Random from "effect/Random";
+import * as AssetSigner from "./assets/AssetSigner.ts";
import * as DatabaseStorage from "./persistence/DatabaseStorage.ts";
import * as StorageCleanup from "./storageCleanup.ts";
import * as PullRequestSyncReactor from "./orchestration-v2/PullRequestSyncReactor.ts";
@@ -719,6 +720,7 @@ const layerRuntimeCoreDependencies = layerRuntimeCoreDependenciesBase.pipe(
Layer.provideMerge(CodexManagedTokenBroker.layer),
Layer.provideMerge(layerServerEnvironment),
Layer.provideMerge(layerAuth),
+ Layer.provideMerge(AssetSigner.layer),
Layer.provideMerge(ServerSecretStore.layer),
Layer.provideMerge(
Layer.mergeAll(
diff --git a/apps/server/src/ws.test.ts b/apps/server/src/ws.test.ts
index dd112e4b49d..ca53e5e3943 100644
--- a/apps/server/src/ws.test.ts
+++ b/apps/server/src/ws.test.ts
@@ -35,6 +35,7 @@ import { RpcGroup, RpcMessage, RpcServer } from "effect/rpc";
import * as SqlClient from "effect/sql/SqlClient";
import * as Statement from "effect/sql/Statement";
+import * as AssetSigner from "./assets/AssetSigner.ts";
import * as PreviewAutomationBroker from "./mcp/PreviewAutomationBroker.ts";
import * as ServerBrowser from "./preview/ServerBrowser.ts";
import * as AcpRegistryRuntimeCoordinator from "@t3tools/provider-acp-registry/server/AcpRegistryRuntimeCoordinator";
@@ -733,6 +734,7 @@ const layerUnusedConfigRpcServices = Layer.mergeAll(
const layerConfigSources = Layer.mergeAll(
Keybindings.layer,
+ AssetSigner.layer.pipe(Layer.provide(ServerSecretStore.layer)),
ServerSettings.layer.pipe(
Layer.provide(Layer.merge(ServerSecretStore.layer, ManagedPolicy.layerTest())),
),