From 2fa4faa18a42c32de79d351a062026da78b29d0b Mon Sep 17 00:00:00 2001 From: Dotta Date: Fri, 10 Apr 2026 11:49:31 -0500 Subject: [PATCH] fix(server): address Greptile auth and heartbeat findings --- server/src/__tests__/better-auth.test.ts | 42 +++++++++++++ server/src/auth/better-auth.ts | 13 +++- server/src/index.ts | 9 +-- server/src/services/heartbeat.ts | 78 ++++++++++++------------ 4 files changed, 96 insertions(+), 46 deletions(-) create mode 100644 server/src/__tests__/better-auth.test.ts diff --git a/server/src/__tests__/better-auth.test.ts b/server/src/__tests__/better-auth.test.ts new file mode 100644 index 00000000000..44aaf089133 --- /dev/null +++ b/server/src/__tests__/better-auth.test.ts @@ -0,0 +1,42 @@ +import { afterEach, describe, expect, it } from "vitest"; +import { MISSING_BETTER_AUTH_SECRET_MESSAGE, requireBetterAuthSecret } from "../auth/better-auth.ts"; + +const originalBetterAuthSecret = process.env.BETTER_AUTH_SECRET; +const originalAgentJwtSecret = process.env.PAPERCLIP_AGENT_JWT_SECRET; + +afterEach(() => { + if (originalBetterAuthSecret === undefined) { + delete process.env.BETTER_AUTH_SECRET; + } else { + process.env.BETTER_AUTH_SECRET = originalBetterAuthSecret; + } + + if (originalAgentJwtSecret === undefined) { + delete process.env.PAPERCLIP_AGENT_JWT_SECRET; + } else { + process.env.PAPERCLIP_AGENT_JWT_SECRET = originalAgentJwtSecret; + } +}); + +describe("requireBetterAuthSecret", () => { + it("throws when neither auth secret environment variable is set", () => { + delete process.env.BETTER_AUTH_SECRET; + delete process.env.PAPERCLIP_AGENT_JWT_SECRET; + + expect(() => requireBetterAuthSecret()).toThrow(MISSING_BETTER_AUTH_SECRET_MESSAGE); + }); + + it("prefers BETTER_AUTH_SECRET when present", () => { + process.env.BETTER_AUTH_SECRET = "primary-secret"; + process.env.PAPERCLIP_AGENT_JWT_SECRET = "secondary-secret"; + + expect(requireBetterAuthSecret()).toBe("primary-secret"); + }); + + it("falls back to PAPERCLIP_AGENT_JWT_SECRET when BETTER_AUTH_SECRET is absent", () => { + delete process.env.BETTER_AUTH_SECRET; + process.env.PAPERCLIP_AGENT_JWT_SECRET = "secondary-secret"; + + expect(requireBetterAuthSecret()).toBe("secondary-secret"); + }); +}); diff --git a/server/src/auth/better-auth.ts b/server/src/auth/better-auth.ts index d338eeb8187..25f44e4b460 100644 --- a/server/src/auth/better-auth.ts +++ b/server/src/auth/better-auth.ts @@ -25,6 +25,9 @@ export type BetterAuthSessionResult = { type BetterAuthInstance = ReturnType; +export const MISSING_BETTER_AUTH_SECRET_MESSAGE = + "authenticated mode requires BETTER_AUTH_SECRET (or PAPERCLIP_AGENT_JWT_SECRET) to be set"; + function headersFromNodeHeaders(rawHeaders: IncomingHttpHeaders): Headers { const headers = new Headers(); for (const [key, raw] of Object.entries(rawHeaders)) { @@ -65,9 +68,17 @@ export function deriveAuthTrustedOrigins(config: Config): string[] { return Array.from(trustedOrigins); } +export function requireBetterAuthSecret(): string { + const secret = process.env.BETTER_AUTH_SECRET?.trim() ?? process.env.PAPERCLIP_AGENT_JWT_SECRET?.trim(); + if (!secret) { + throw new Error(MISSING_BETTER_AUTH_SECRET_MESSAGE); + } + return secret; +} + export function createBetterAuthInstance(db: Db, config: Config, trustedOrigins?: string[]): BetterAuthInstance { const baseUrl = config.authBaseUrlMode === "explicit" ? config.authPublicBaseUrl : undefined; - const secret = process.env.BETTER_AUTH_SECRET ?? process.env.PAPERCLIP_AGENT_JWT_SECRET ?? "paperclip-dev-secret"; + const secret = requireBetterAuthSecret(); const effectiveTrustedOrigins = trustedOrigins ?? deriveAuthTrustedOrigins(config); const publicUrl = process.env.PAPERCLIP_PUBLIC_URL ?? baseUrl; diff --git a/server/src/index.ts b/server/src/index.ts index a384342f5e5..6fb078fcc46 100644 --- a/server/src/index.ts +++ b/server/src/index.ts @@ -472,16 +472,11 @@ export async function startServer(): Promise { createBetterAuthHandler, createBetterAuthInstance, deriveAuthTrustedOrigins, + requireBetterAuthSecret, resolveBetterAuthSession, resolveBetterAuthSessionFromHeaders, } = await import("./auth/better-auth.js"); - const betterAuthSecret = - process.env.BETTER_AUTH_SECRET?.trim() ?? process.env.PAPERCLIP_AGENT_JWT_SECRET?.trim(); - if (!betterAuthSecret) { - throw new Error( - "authenticated mode requires BETTER_AUTH_SECRET (or PAPERCLIP_AGENT_JWT_SECRET) to be set", - ); - } + requireBetterAuthSecret(); const derivedTrustedOrigins = deriveAuthTrustedOrigins(config); const envTrustedOrigins = (process.env.BETTER_AUTH_TRUSTED_ORIGINS ?? "") .split(",") diff --git a/server/src/services/heartbeat.ts b/server/src/services/heartbeat.ts index b4b34751098..e64d0f0a797 100644 --- a/server/src/services/heartbeat.ts +++ b/server/src/services/heartbeat.ts @@ -266,44 +266,46 @@ async function ensureManagedProjectWorkspace(input: { } } -const heartbeatRunProcessGroupIdColumn = - heartbeatRuns.processGroupId ?? sql`NULL`.as("processGroupId"); +function getHeartbeatRunListColumns() { + const processGroupIdColumn = + heartbeatRuns.processGroupId ?? sql`NULL`.as("processGroupId"); -const heartbeatRunListColumns = { - id: heartbeatRuns.id, - companyId: heartbeatRuns.companyId, - agentId: heartbeatRuns.agentId, - invocationSource: heartbeatRuns.invocationSource, - triggerDetail: heartbeatRuns.triggerDetail, - status: heartbeatRuns.status, - startedAt: heartbeatRuns.startedAt, - finishedAt: heartbeatRuns.finishedAt, - error: heartbeatRuns.error, - wakeupRequestId: heartbeatRuns.wakeupRequestId, - exitCode: heartbeatRuns.exitCode, - signal: heartbeatRuns.signal, - usageJson: heartbeatRuns.usageJson, - resultJson: heartbeatRuns.resultJson, - sessionIdBefore: heartbeatRuns.sessionIdBefore, - sessionIdAfter: heartbeatRuns.sessionIdAfter, - logStore: heartbeatRuns.logStore, - logRef: heartbeatRuns.logRef, - logBytes: heartbeatRuns.logBytes, - logSha256: heartbeatRuns.logSha256, - logCompressed: heartbeatRuns.logCompressed, - stdoutExcerpt: sql`NULL`.as("stdoutExcerpt"), - stderrExcerpt: sql`NULL`.as("stderrExcerpt"), - errorCode: heartbeatRuns.errorCode, - externalRunId: heartbeatRuns.externalRunId, - processPid: heartbeatRuns.processPid, - processGroupId: heartbeatRunProcessGroupIdColumn, - processStartedAt: heartbeatRuns.processStartedAt, - retryOfRunId: heartbeatRuns.retryOfRunId, - processLossRetryCount: heartbeatRuns.processLossRetryCount, - contextSnapshot: heartbeatRuns.contextSnapshot, - createdAt: heartbeatRuns.createdAt, - updatedAt: heartbeatRuns.updatedAt, -} as const; + return { + id: heartbeatRuns.id, + companyId: heartbeatRuns.companyId, + agentId: heartbeatRuns.agentId, + invocationSource: heartbeatRuns.invocationSource, + triggerDetail: heartbeatRuns.triggerDetail, + status: heartbeatRuns.status, + startedAt: heartbeatRuns.startedAt, + finishedAt: heartbeatRuns.finishedAt, + error: heartbeatRuns.error, + wakeupRequestId: heartbeatRuns.wakeupRequestId, + exitCode: heartbeatRuns.exitCode, + signal: heartbeatRuns.signal, + usageJson: heartbeatRuns.usageJson, + resultJson: heartbeatRuns.resultJson, + sessionIdBefore: heartbeatRuns.sessionIdBefore, + sessionIdAfter: heartbeatRuns.sessionIdAfter, + logStore: heartbeatRuns.logStore, + logRef: heartbeatRuns.logRef, + logBytes: heartbeatRuns.logBytes, + logSha256: heartbeatRuns.logSha256, + logCompressed: heartbeatRuns.logCompressed, + stdoutExcerpt: sql`NULL`.as("stdoutExcerpt"), + stderrExcerpt: sql`NULL`.as("stderrExcerpt"), + errorCode: heartbeatRuns.errorCode, + externalRunId: heartbeatRuns.externalRunId, + processPid: heartbeatRuns.processPid, + processGroupId: processGroupIdColumn, + processStartedAt: heartbeatRuns.processStartedAt, + retryOfRunId: heartbeatRuns.retryOfRunId, + processLossRetryCount: heartbeatRuns.processLossRetryCount, + contextSnapshot: heartbeatRuns.contextSnapshot, + createdAt: heartbeatRuns.createdAt, + updatedAt: heartbeatRuns.updatedAt, + } as const; +} const heartbeatRunIssueSummaryColumns = { id: heartbeatRuns.id, @@ -4424,7 +4426,7 @@ export function heartbeatService(db: Db) { return { list: async (companyId: string, agentId?: string, limit?: number) => { const query = db - .select(heartbeatRunListColumns) + .select(getHeartbeatRunListColumns()) .from(heartbeatRuns) .where( agentId