fix(server): address Greptile auth and heartbeat findings

This commit is contained in:
Dotta committed 2026-04-10 11:49:31 -05:00
1 parent 685c0b69dc
commit 2fa4faa18a
4 files changed
+96 -46

No files matched your search

+42
View File
@@ -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");
});
});
+12 -1
View File
@@ -25,6 +25,9 @@ export type BetterAuthSessionResult = {
type BetterAuthInstance = ReturnType<typeof betterAuth>;
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;
+2 -7
View File
@@ -472,16 +472,11 @@ export async function startServer(): Promise<StartedServer> {
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(",")
+40 -38
View File
@@ -266,44 +266,46 @@ async function ensureManagedProjectWorkspace(input: {
}
}
const heartbeatRunProcessGroupIdColumn =
heartbeatRuns.processGroupId ?? sql<number | null>`NULL`.as("processGroupId");
function getHeartbeatRunListColumns() {
const processGroupIdColumn =
heartbeatRuns.processGroupId ?? sql<number | null>`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<string | null>`NULL`.as("stdoutExcerpt"),
stderrExcerpt: sql<string | null>`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<string | null>`NULL`.as("stdoutExcerpt"),
stderrExcerpt: sql<string | null>`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