The open-source app everyone uses to manage agents at work
TypeScript acpxagent-orchestrationagent-skillsagentic-aiai-agentsai-engineeringai-governanceai-toolsautonomous-agentsclaudeclaude-codeclaude-skillscodexhermesllmmcpmulti-agentopenclawproject-managementworkflow-automation
fix(routines): reject HMAC webhook replays (#9994)
Jonathan Reyes676e20a8944f
diff --git a/server/src/__tests__/routines-service.test.ts b/server/src/__tests__/routines-service.test.tsindex b634b81330..772747a873 100644--- a/server/src/__tests__/routines-service.test.ts+++ b/server/src/__tests__/routines-service.test.ts@@ -2012,6 +2012,124 @@ describeEmbeddedPostgres("routine service live-execution coalescing", () => {expect(run.linkedIssueId).toBeTruthy();});+ it("rejects an HMAC webhook replay inside the accepted timestamp window", async () => {+ const { routine, svc } = await seedFixture();+ const { trigger, secretMaterial } = await svc.createTrigger(+ routine.id,+ {+ kind: "webhook",+ signingMode: "hmac_sha256",+ replayWindowSec: 300,+ },+ {},+ );++ const payload = { event: "acceptance" };+ const rawBody = Buffer.from(JSON.stringify(payload));+ const timestampSeconds = String(Math.floor(Date.now() / 1000));+ const signature = `sha256=${createHmac("sha256", secretMaterial!.webhookSecret)+ .update(`${timestampSeconds}.`)+ .update(rawBody)+ .digest("hex")}`;+ const request = {+ signatureHeader: signature,+ timestampHeader: timestampSeconds,+ rawBody,+ payload,+ };++ await expect(svc.firePublicTrigger(trigger.publicId!, request)).resolves.toMatchObject({+ source: "webhook",+ status: "issue_created",+ });+ await expect(svc.firePublicTrigger(trigger.publicId!, request)).rejects.toThrow(+ "Webhook replay detected",+ );++ const runs = await db+ .select({ id: routineRuns.id })+ .from(routineRuns)+ .where(eq(routineRuns.triggerId, trigger.id));+ expect(runs).toHaveLength(1);+ });++ it("serializes concurrent HMAC webhook replays", async () => {+ const { routine, svc } = await seedFixture();+ const { trigger, secretMaterial } = await svc.createTrigger(+ routine.id,+ {+ kind: "webhook",+ signingMode: "hmac_sha256",+ replayWindowSec: 300,+ },+ {},+ );++ const payload = { event: "concurrent" };+ const rawBody = Buffer.from(JSON.stringify(payload));+ const timestampSeconds = String(Math.floor(Date.now() / 1000));+ const signature = `sha256=${createHmac("sha256", secretMaterial!.webhookSecret)+ .update(`${timestampSeconds}.`)+ .update(rawBody)+ .digest("hex")}`;+ const request = {+ signatureHeader: signature,+ timestampHeader: timestampSeconds,+ rawBody,+ payload,+ };++ const results = await Promise.allSettled([+ svc.firePublicTrigger(trigger.publicId!, request),+ svc.firePublicTrigger(trigger.publicId!, request),+ ]);++ expect(results.filter((result) => result.status === "fulfilled")).toHaveLength(1);+ const rejected = results.find((result) => result.status === "rejected");+ expect(rejected).toMatchObject({ status: "rejected" });+ expect((rejected as PromiseRejectedResult).reason).toMatchObject({+ message: "Webhook replay detected",+ });+ expect(await db.select().from(routineRuns).where(eq(routineRuns.triggerId, trigger.id))).toHaveLength(1);+ });++ it("rejects an HMAC webhook replay when automatic execution is suppressed", async () => {+ const runtimeEnv = { PAPERCLIP_IN_WORKTREE: "yes", PAPERCLIP_INSTANCE_ID: "worktree-routines-test" };+ const { routine, svc } = await seedFixture({ runtimeEnv });+ const { trigger, secretMaterial } = await svc.createTrigger(+ routine.id,+ {+ kind: "webhook",+ signingMode: "hmac_sha256",+ replayWindowSec: 300,+ },+ {},+ );++ const payload = { event: "suppressed" };+ const rawBody = Buffer.from(JSON.stringify(payload));+ const timestampSeconds = String(Math.floor(Date.now() / 1000));+ const signature = `sha256=${createHmac("sha256", secretMaterial!.webhookSecret)+ .update(`${timestampSeconds}.`)+ .update(rawBody)+ .digest("hex")}`;+ const request = {+ signatureHeader: signature,+ timestampHeader: timestampSeconds,+ rawBody,+ payload,+ };++ await expect(svc.firePublicTrigger(trigger.publicId!, request)).resolves.toMatchObject({+ status: "skipped",+ failureReason: "worktree_execution_cutoff",+ });+ await expect(svc.firePublicTrigger(trigger.publicId!, request)).rejects.toThrow(+ "Webhook replay detected",+ );+ expect(await db.select().from(routineRuns).where(eq(routineRuns.triggerId, trigger.id))).toHaveLength(1);+ });+it("uses the configured provider for generated webhook trigger secrets", async () => {process.env.PAPERCLIP_SECRETS_PROVIDER = "aws_secrets_manager";const originalGetSecretProvider = providerRegistry.getSecretProvider;diff --git a/server/src/services/routines.ts b/server/src/services/routines.tsindex f501696b15..95f7a3e06b 100644--- a/server/src/services/routines.ts+++ b/server/src/services/routines.ts@@ -1359,10 +1359,40 @@ export function routineService(reason: string;nextRunAt?: Date | null;details?: Record<string, unknown> | null;+ idempotencyKey?: string | null;+ rejectIdempotencyReplay?: boolean;}) {const triggeredAt = new Date();const run = await db.transaction(async (tx) => {const txDb = tx as unknown as Db;+ await tx.execute(+ sql`select id from ${routines} where ${routines.id} = ${input.routine.id} and ${routines.companyId} = ${input.routine.companyId} for update`,+ );++ if (input.idempotencyKey) {+ const existing = await txDb+ .select()+ .from(routineRuns)+ .where(+ and(+ eq(routineRuns.companyId, input.routine.companyId),+ eq(routineRuns.routineId, input.routine.id),+ eq(routineRuns.source, input.source),+ eq(routineRuns.idempotencyKey, input.idempotencyKey),+ eq(routineRuns.triggerId, input.trigger.id),+ ),+ )+ .orderBy(desc(routineRuns.createdAt))+ .limit(1)+ .then((rows) => rows[0] ?? null);+ if (existing) {+ if (input.rejectIdempotencyReplay) {+ throw conflict("Webhook replay detected");+ }+ return existing;+ }+ }+const [createdRun] = await txDb.insert(routineRuns).values({@@ -1378,6 +1408,7 @@ export function routineService(routineRevisionId: input.routine.latestRevisionId,responsibleUserId: input.routine.responsibleUserId ?? null,triggerPayload: input.details ?? null,+ idempotencyKey: input.idempotencyKey ?? null,}).returning();await updateRoutineTouchedState({@@ -1636,6 +1667,7 @@ export function routineService(projectWorkspaceId?: string | null;assigneeAgentId?: string | null;idempotencyKey?: string | null;+ rejectIdempotencyReplay?: boolean;executionWorkspaceId?: string | null;executionWorkspacePreference?: string | null;executionWorkspaceSettings?: Record<string, unknown> | null;@@ -1723,7 +1755,12 @@ export function routineService(.orderBy(desc(routineRuns.createdAt)).limit(1).then((rows) => rows[0] ?? null);- if (existing) return existing;+ if (existing) {+ if (input.rejectIdempotencyReplay) {+ throw conflict("Webhook replay detected");+ }+ return existing;+ }}const triggeredAt = new Date();@@ -2814,6 +2851,7 @@ export function routineService(if (!routine) throw notFound("Routine not found");if (!trigger.enabled || routine.status !== "active") throw conflict("Routine trigger is not active");+ let hmacReplayKey: string | null = null;if (trigger.signingMode === "none") {// No authentication — the publicId in the URL acts as a shared secret.} else if (trigger.signingMode === "github_hmac") {@@ -2870,6 +2908,10 @@ export function routineService(normalizedSignature.length === expectedHmac.length &&crypto.timingSafeEqual(Buffer.from(normalizedSignature), Buffer.from(expectedHmac));if (!valid) throw unauthorized();+ hmacReplayKey = `webhook-hmac:${crypto+ .createHash("sha256")+ .update(`${trigger.id}:${providedTimestamp}:${expectedHmac}`)+ .digest("hex")}`;}const eligibility = await getAutomaticRoutineDispatchEligibility(routine);@@ -2879,6 +2921,8 @@ export function routineService(trigger,source: "webhook",reason: "worktree_execution_cutoff",+ idempotencyKey: hmacReplayKey ?? input.idempotencyKey,+ rejectIdempotencyReplay: hmacReplayKey !== null,});}@@ -2890,7 +2934,8 @@ export function routineService(variables: isPlainRecord(input.payload) && isPlainRecord(input.payload.variables)? input.payload.variables: null,- idempotencyKey: input.idempotencyKey,+ idempotencyKey: hmacReplayKey ?? input.idempotencyKey,+ rejectIdempotencyReplay: hmacReplayKey !== null,});},