Skip to content

Commit e6158f5

Browse files
fix(server): validate scheduled task rebinds before saving
1 parent f9f7a45 commit e6158f5

4 files changed

Lines changed: 54 additions & 49 deletions

File tree

‎apps/server/src/mcp/toolkits/thread/handlers.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,7 @@ export const layer = McpToolAccess.toLayer(ThreadToolkit, {
8585
code: "invalid_request",
8686
message: "The scheduled task was not found.",
8787
});
88-
// The listed project rides into the dispatch transaction: a task moved
89-
// to another project after this check is a missing row, never a run
90-
// fired in a project the caller was not checked against.
88+
// Pin the listed project so a concurrent move rejects the run at reservation.
9189
const { task } = yield* scheduler
9290
.runNow({ id: input.taskId, projectId: listed.projectId })
9391
.pipe(Effect.mapError(unavailable));

‎apps/server/src/scheduledTasks/ScheduledTaskService.ts‎

Lines changed: 42 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1049,43 +1049,6 @@ export const layer = Layer.effect(
10491049
maxDeliveryAgeMinutes: input.schedule.maxDeliveryAgeMinutes ?? null,
10501050
}
10511051
: input.schedule;
1052-
const webhook =
1053-
input.schedule.type === "webhook"
1054-
? yield* Effect.gen(function* () {
1055-
const existing = existingTask === null ? null : yield* findWebhookCredentials(id);
1056-
const token = existing?.token ?? (yield* newWebhookToken);
1057-
const signature =
1058-
input.schedule.type === "webhook" ? input.schedule.signature : null;
1059-
// A secretRef is a value the user entered for an agent; this
1060-
// save consumes it, so it cannot be used again. A replay of a
1061-
// save that already used it keeps the secret that save stored.
1062-
const replay = input.commandId !== undefined && existing?.secret != null;
1063-
const fromRef =
1064-
signature?.secretRef === undefined
1065-
? undefined
1066-
: yield* secretRequests
1067-
.consume({ ref: signature.secretRef, projectId: input.projectId })
1068-
.pipe(
1069-
Effect.catch((error) =>
1070-
replay
1071-
? Effect.succeed(undefined)
1072-
: Effect.fail(taskError(error.message, { taskId: id, cause: error })),
1073-
),
1074-
);
1075-
// A ref, when given, is the only source: a plain secret sent
1076-
// alongside it must not replace what a replayed save stored.
1077-
const provided = signature?.secretRef === undefined ? signature?.secret : fromRef;
1078-
const secret = signature == null ? null : (provided ?? existing?.secret ?? null);
1079-
const secretChanged =
1080-
signature == null || provided !== undefined || existing === null;
1081-
if (signature != null && secret === null) {
1082-
return yield* taskError("A webhook signature check needs a signing secret.", {
1083-
taskId: id,
1084-
});
1085-
}
1086-
return { token, secret, secretChanged };
1087-
})
1088-
: { token: null, secret: null, secretChanged: true };
10891052
const scheduleUnchanged =
10901053
existingTask !== null &&
10911054
existingTask.enabled === input.enabled &&
@@ -1123,6 +1086,43 @@ export const layer = Layer.effect(
11231086
) {
11241087
yield* requireThreadInProject(task);
11251088
}
1089+
const webhook =
1090+
input.schedule.type === "webhook"
1091+
? yield* Effect.gen(function* () {
1092+
const existing = existingTask === null ? null : yield* findWebhookCredentials(id);
1093+
const token = existing?.token ?? (yield* newWebhookToken);
1094+
const signature =
1095+
input.schedule.type === "webhook" ? input.schedule.signature : null;
1096+
// A secretRef is a value the user entered for an agent; this
1097+
// save consumes it, so it cannot be used again. A replay of a
1098+
// save that already used it keeps the secret that save stored.
1099+
const replay = input.commandId !== undefined && existing?.secret != null;
1100+
const fromRef =
1101+
signature?.secretRef === undefined
1102+
? undefined
1103+
: yield* secretRequests
1104+
.consume({ ref: signature.secretRef, projectId: input.projectId })
1105+
.pipe(
1106+
Effect.catch((error) =>
1107+
replay
1108+
? Effect.succeed(undefined)
1109+
: Effect.fail(taskError(error.message, { taskId: id, cause: error })),
1110+
),
1111+
);
1112+
// A ref, when given, is the only source: a plain secret sent
1113+
// alongside it must not replace what a replayed save stored.
1114+
const provided = signature?.secretRef === undefined ? signature?.secret : fromRef;
1115+
const secret = signature == null ? null : (provided ?? existing?.secret ?? null);
1116+
const secretChanged =
1117+
signature == null || provided !== undefined || existing === null;
1118+
if (signature != null && secret === null) {
1119+
return yield* taskError("A webhook signature check needs a signing secret.", {
1120+
taskId: id,
1121+
});
1122+
}
1123+
return { token, secret, secretChanged };
1124+
})
1125+
: { token: null, secret: null, secretChanged: true };
11261126
yield* saveTask(task, input.requireExisting === true, webhook);
11271127
return { task: (yield* findTask(id)) ?? task };
11281128
});
@@ -1147,6 +1147,10 @@ export const layer = Layer.effect(
11471147
if (row === undefined || row.project_id !== input.projectId) return Option.none();
11481148
yield* checkAuthorizedTask(row, input);
11491149
const existing = yield* decodeRow(row, yield* readWebhookOrigin);
1150+
const threadId = input.threadId === undefined ? existing.threadId : input.threadId;
1151+
if (threadId !== existing.threadId) {
1152+
yield* checkAuthorizedTask({ ...row, thread_id: threadId }, { id: input.id });
1153+
}
11501154
const workspaceStrategy =
11511155
input.workspaceStrategy ??
11521156
(input.workspaceStrategyPatch === undefined
@@ -1167,7 +1171,7 @@ export const layer = Layer.effect(
11671171
enabled: input.enabled ?? existing.enabled,
11681172
schedule: input.schedule ?? existing.schedule,
11691173
projectId: input.nextProjectId ?? existing.projectId,
1170-
threadId: input.threadId === undefined ? existing.threadId : input.threadId,
1174+
threadId,
11711175
workspaceStrategy,
11721176
modelSelection: input.modelSelection ?? existing.modelSelection,
11731177
runtimeMode: input.runtimeMode ?? existing.runtimeMode,

‎apps/server/src/telemetry/FeatureUsage.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ const METHOD_FEATURES: Readonly<Record<string, (payload: Payload) => FeatureUsag
7474
[WS_METHODS.pullRequestsSubmitReview]: () => ({ feature: "pull_request.review" }),
7575
[WS_METHODS.pullRequestsComment]: () => ({ feature: "pull_request.comment" }),
7676
[WS_METHODS.scheduledTasksUpsert]: () => ({ feature: "scheduled_task.save" }),
77+
[WS_METHODS.scheduledTasksUpdate]: () => ({ feature: "scheduled_task.save" }),
7778
[WS_METHODS.scheduledTasksRunNow]: () => ({ feature: "scheduled_task.run_now" }),
7879
[WS_METHODS.agentSessionsImport]: () => ({ feature: "agent_session.import" }),
7980
[WS_METHODS.projectCloneStart]: () => ({ feature: "project.clone" }),

‎apps/server/src/ws.ts‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2055,14 +2055,16 @@ const layerWsRpc = (
20552055
Effect.annotateCurrentSpan({ "scheduled_task.id": input.id }).pipe(
20562056
Effect.andThen(scheduledTasks.delete(input)),
20572057
Effect.flatMap((deleted) =>
2058-
Option.isNone(deleted)
2059-
? Effect.fail(
2060-
new ScheduledTaskError({
2061-
message: "Schedule task not found.",
2062-
taskId: input.id,
2063-
}),
2064-
)
2065-
: Effect.succeed(deleted.value),
2058+
Option.isSome(deleted)
2059+
? Effect.succeed(deleted.value)
2060+
: input.projectId === undefined
2061+
? Effect.succeed({ id: input.id })
2062+
: Effect.fail(
2063+
new ScheduledTaskError({
2064+
message: "Schedule task not found.",
2065+
taskId: input.id,
2066+
}),
2067+
),
20662068
),
20672069
),
20682070
[WS_METHODS.scheduledTasksRunNow]: (input) =>

0 commit comments

Comments
 (0)