32a9165ddf
## Thinking Path > - Paperclip orchestrates AI agents for zero-human companies > - The control plane depends on authenticated routes enforcing company boundaries and role permissions correctly > - This branch also touches the issue detail and markdown editing flows operators use while handling advisory and triage work > - Partial issue cache seeds and fragile rich-editor parsing could leave important issue content missing or blank at the moment an operator needed it > - Blocked issues becoming actionable again should wake their assignee automatically instead of silently staying idle > - This pull request rebases the advisory follow-up branch onto current `master`, hardens authenticated route authorization, and carries the issue-detail/editor reliability fixes forward with regression tests > - The benefit is tighter authz on sensitive routes plus more reliable issue/advisory editing and wakeup behavior on top of the latest base ## What Changed - Hardened authenticated route authorization across agent, activity, approval, access, project, plugin, health, execution-workspace, portability, and related server paths, with new cross-tenant and runtime-authz regression coverage. - Switched issue detail queries from `initialData` to placeholder-based hydration so list/quicklook seeds still refetch full issue bodies. - Normalized advisory-style HTML images before mounting the markdown editor and strengthened fallback behavior when the rich editor silently fails or rejects the content. - Woke assigned agents when blocked issues move back to `todo`, with route coverage for reopen and unblock transitions. - Rebasing note: this branch now sits cleanly on top of the latest `master` tip used for the PR base. ## Verification - `pnpm exec vitest run ui/src/lib/issueDetailQuery.test.tsx ui/src/components/MarkdownEditor.test.tsx server/src/__tests__/issue-comment-reopen-routes.test.ts server/src/__tests__/activity-routes.test.ts server/src/__tests__/agent-cross-tenant-authz-routes.test.ts` - Confirmed `pnpm-lock.yaml` is not part of the PR diff. - Rebased the branch onto current `public-gh/master` before publishing. ## Risks - Broad authz tightening may expose existing flows that were relying on permissive board or agent access and now need explicit grants. - Markdown editor fallback changes could affect focus or rendering in edge-case content that mixes HTML-like advisory markup with normal markdown. - This verification was intentionally scoped to touched regressions and did not run the full repository suite. ## Model Used - OpenAI Codex, GPT-5-based coding agent in the Codex CLI environment with tool use for terminal, git, and GitHub operations. The exact runtime model identifier is not exposed inside this session. ## Checklist - [x] I have included a thinking path that traces from project context to this change - [x] I have specified the model used (with version and capability details) - [x] I have run tests locally and they pass - [x] I have added or updated tests where applicable - [x] If this change affects the UI, it is behavior-only and does not need before/after screenshots - [x] I have updated relevant documentation to reflect my changes, or no documentation changes were needed for these internal fixes - [x] I have considered and documented any risks above - [x] I will address all Greptile and reviewer comments before requesting merge --------- Co-authored-by: Paperclip <noreply@paperclip.ing>
335 lines
10 KiB
TypeScript
335 lines
10 KiB
TypeScript
import express from "express";
|
|
import request from "supertest";
|
|
import { beforeEach, describe, expect, it, vi } from "vitest";
|
|
|
|
const mockApprovalService = vi.hoisted(() => ({
|
|
list: vi.fn(),
|
|
getById: vi.fn(),
|
|
create: vi.fn(),
|
|
approve: vi.fn(),
|
|
reject: vi.fn(),
|
|
requestRevision: vi.fn(),
|
|
resubmit: vi.fn(),
|
|
listComments: vi.fn(),
|
|
addComment: vi.fn(),
|
|
}));
|
|
|
|
const mockHeartbeatService = vi.hoisted(() => ({
|
|
wakeup: vi.fn(),
|
|
}));
|
|
|
|
const mockIssueApprovalService = vi.hoisted(() => ({
|
|
listIssuesForApproval: vi.fn(),
|
|
linkManyForApproval: vi.fn(),
|
|
}));
|
|
|
|
const mockSecretService = vi.hoisted(() => ({
|
|
normalizeHireApprovalPayloadForPersistence: vi.fn(),
|
|
}));
|
|
|
|
const mockLogActivity = vi.hoisted(() => vi.fn());
|
|
|
|
vi.mock("../services/index.js", () => ({
|
|
approvalService: () => mockApprovalService,
|
|
heartbeatService: () => mockHeartbeatService,
|
|
issueApprovalService: () => mockIssueApprovalService,
|
|
logActivity: mockLogActivity,
|
|
secretService: () => mockSecretService,
|
|
}));
|
|
|
|
function registerModuleMocks() {
|
|
vi.doMock("../services/index.js", () => ({
|
|
approvalService: () => mockApprovalService,
|
|
heartbeatService: () => mockHeartbeatService,
|
|
issueApprovalService: () => mockIssueApprovalService,
|
|
logActivity: mockLogActivity,
|
|
secretService: () => mockSecretService,
|
|
}));
|
|
}
|
|
|
|
async function createApp(actorOverrides: Record<string, unknown> = {}) {
|
|
const [{ errorHandler }, { approvalRoutes }] = await Promise.all([
|
|
vi.importActual<typeof import("../middleware/index.js")>("../middleware/index.js"),
|
|
vi.importActual<typeof import("../routes/approvals.js")>("../routes/approvals.js"),
|
|
]);
|
|
const app = express();
|
|
app.use(express.json());
|
|
app.use((req, _res, next) => {
|
|
(req as any).actor = {
|
|
type: "board",
|
|
userId: "user-1",
|
|
companyIds: ["company-1"],
|
|
source: "session",
|
|
isInstanceAdmin: false,
|
|
...actorOverrides,
|
|
};
|
|
next();
|
|
});
|
|
app.use("/api", approvalRoutes({} as any));
|
|
app.use(errorHandler);
|
|
return app;
|
|
}
|
|
|
|
async function createAgentApp() {
|
|
const [{ errorHandler }, { approvalRoutes }] = await Promise.all([
|
|
vi.importActual<typeof import("../middleware/index.js")>("../middleware/index.js"),
|
|
vi.importActual<typeof import("../routes/approvals.js")>("../routes/approvals.js"),
|
|
]);
|
|
const app = express();
|
|
app.use(express.json());
|
|
app.use((req, _res, next) => {
|
|
(req as any).actor = {
|
|
type: "agent",
|
|
agentId: "agent-1",
|
|
companyId: "company-1",
|
|
source: "api_key",
|
|
isInstanceAdmin: false,
|
|
};
|
|
next();
|
|
});
|
|
app.use("/api", approvalRoutes({} as any));
|
|
app.use(errorHandler);
|
|
return app;
|
|
}
|
|
|
|
describe("approval routes idempotent retries", () => {
|
|
beforeEach(() => {
|
|
vi.resetModules();
|
|
vi.doUnmock("../routes/approvals.js");
|
|
vi.doUnmock("../middleware/index.js");
|
|
registerModuleMocks();
|
|
vi.resetAllMocks();
|
|
mockHeartbeatService.wakeup.mockResolvedValue({ id: "wake-1" });
|
|
mockIssueApprovalService.listIssuesForApproval.mockResolvedValue([{ id: "issue-1" }]);
|
|
mockLogActivity.mockResolvedValue(undefined);
|
|
});
|
|
|
|
it("does not emit duplicate approval side effects when approve is already resolved", async () => {
|
|
mockApprovalService.getById.mockResolvedValue({
|
|
id: "approval-1",
|
|
companyId: "company-1",
|
|
type: "hire_agent",
|
|
status: "approved",
|
|
payload: {},
|
|
requestedByAgentId: "agent-1",
|
|
});
|
|
mockApprovalService.approve.mockResolvedValue({
|
|
approval: {
|
|
id: "approval-1",
|
|
companyId: "company-1",
|
|
type: "hire_agent",
|
|
status: "approved",
|
|
payload: {},
|
|
requestedByAgentId: "agent-1",
|
|
},
|
|
applied: false,
|
|
});
|
|
|
|
const res = await request(await createApp())
|
|
.post("/api/approvals/approval-1/approve")
|
|
.send({});
|
|
|
|
expect(res.status).toBe(200);
|
|
expect(mockIssueApprovalService.listIssuesForApproval).not.toHaveBeenCalled();
|
|
expect(mockHeartbeatService.wakeup).not.toHaveBeenCalled();
|
|
expect(mockLogActivity).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it("does not emit duplicate rejection logs when reject is already resolved", async () => {
|
|
mockApprovalService.getById.mockResolvedValue({
|
|
id: "approval-1",
|
|
companyId: "company-1",
|
|
type: "hire_agent",
|
|
status: "rejected",
|
|
payload: {},
|
|
});
|
|
mockApprovalService.reject.mockResolvedValue({
|
|
approval: {
|
|
id: "approval-1",
|
|
companyId: "company-1",
|
|
type: "hire_agent",
|
|
status: "rejected",
|
|
payload: {},
|
|
},
|
|
applied: false,
|
|
});
|
|
|
|
const res = await request(await createApp())
|
|
.post("/api/approvals/approval-1/reject")
|
|
.send({});
|
|
|
|
expect(res.status).toBe(200);
|
|
expect(mockLogActivity).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it("rejects approval decisions for companies outside the caller scope", async () => {
|
|
mockApprovalService.getById.mockResolvedValue({
|
|
id: "approval-2",
|
|
companyId: "company-2",
|
|
type: "hire_agent",
|
|
status: "pending",
|
|
payload: {},
|
|
});
|
|
|
|
const res = await request(await createApp())
|
|
.post("/api/approvals/approval-2/approve")
|
|
.send({});
|
|
|
|
expect(res.status).toBe(403);
|
|
expect(mockApprovalService.approve).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it("rejects approval revision requests for companies outside the caller scope", async () => {
|
|
mockApprovalService.getById.mockResolvedValue({
|
|
id: "approval-3",
|
|
companyId: "company-2",
|
|
type: "hire_agent",
|
|
status: "pending",
|
|
payload: {},
|
|
});
|
|
|
|
const res = await request(await createApp())
|
|
.post("/api/approvals/approval-3/request-revision")
|
|
.send({ decisionNote: "Need changes" });
|
|
|
|
expect(res.status).toBe(403);
|
|
expect(mockApprovalService.requestRevision).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it("derives approval attribution from the authenticated actor on approve", async () => {
|
|
mockApprovalService.getById.mockResolvedValue({
|
|
id: "approval-4",
|
|
companyId: "company-1",
|
|
type: "hire_agent",
|
|
status: "pending",
|
|
payload: {},
|
|
requestedByAgentId: null,
|
|
});
|
|
mockApprovalService.approve.mockResolvedValue({
|
|
approval: {
|
|
id: "approval-4",
|
|
companyId: "company-1",
|
|
type: "hire_agent",
|
|
status: "approved",
|
|
payload: {},
|
|
requestedByAgentId: null,
|
|
},
|
|
applied: true,
|
|
});
|
|
|
|
const res = await request(await createApp())
|
|
.post("/api/approvals/approval-4/approve")
|
|
.send({ decidedByUserId: "forged-user", decisionNote: "ship it" });
|
|
|
|
expect(res.status).toBe(200);
|
|
expect(mockApprovalService.approve).toHaveBeenCalledWith("approval-4", "user-1", "ship it");
|
|
});
|
|
|
|
it("derives approval attribution from the authenticated actor on reject", async () => {
|
|
mockApprovalService.getById.mockResolvedValue({
|
|
id: "approval-5",
|
|
companyId: "company-1",
|
|
type: "hire_agent",
|
|
status: "pending",
|
|
payload: {},
|
|
});
|
|
mockApprovalService.reject.mockResolvedValue({
|
|
approval: {
|
|
id: "approval-5",
|
|
companyId: "company-1",
|
|
type: "hire_agent",
|
|
status: "rejected",
|
|
payload: {},
|
|
},
|
|
applied: true,
|
|
});
|
|
|
|
const res = await request(await createApp())
|
|
.post("/api/approvals/approval-5/reject")
|
|
.send({ decidedByUserId: "forged-user", decisionNote: "not now" });
|
|
|
|
expect(res.status).toBe(200);
|
|
expect(mockApprovalService.reject).toHaveBeenCalledWith("approval-5", "user-1", "not now");
|
|
});
|
|
|
|
it("derives approval attribution from the authenticated actor on request revision", async () => {
|
|
mockApprovalService.getById.mockResolvedValue({
|
|
id: "approval-6",
|
|
companyId: "company-1",
|
|
type: "hire_agent",
|
|
status: "pending",
|
|
payload: {},
|
|
});
|
|
mockApprovalService.requestRevision.mockResolvedValue({
|
|
id: "approval-6",
|
|
companyId: "company-1",
|
|
type: "hire_agent",
|
|
status: "revision_requested",
|
|
payload: {},
|
|
});
|
|
|
|
const res = await request(await createApp())
|
|
.post("/api/approvals/approval-6/request-revision")
|
|
.send({ decidedByUserId: "forged-user", decisionNote: "Need changes" });
|
|
|
|
expect(res.status).toBe(200);
|
|
expect(mockApprovalService.requestRevision).toHaveBeenCalledWith(
|
|
"approval-6",
|
|
"user-1",
|
|
"Need changes",
|
|
);
|
|
});
|
|
|
|
it("lets agents create generic issue-linked board approval requests", async () => {
|
|
mockApprovalService.create.mockResolvedValue({
|
|
id: "approval-1",
|
|
companyId: "company-1",
|
|
type: "request_board_approval",
|
|
requestedByAgentId: "agent-1",
|
|
requestedByUserId: null,
|
|
status: "pending",
|
|
payload: { title: "Approve hosting spend" },
|
|
decisionNote: null,
|
|
decidedByUserId: null,
|
|
decidedAt: null,
|
|
createdAt: new Date("2026-04-06T00:00:00.000Z"),
|
|
updatedAt: new Date("2026-04-06T00:00:00.000Z"),
|
|
});
|
|
|
|
const res = await request(await createAgentApp())
|
|
.post("/api/companies/company-1/approvals")
|
|
.send({
|
|
type: "request_board_approval",
|
|
issueIds: ["00000000-0000-0000-0000-000000000001"],
|
|
payload: { title: "Approve hosting spend" },
|
|
});
|
|
|
|
expect([200, 201], JSON.stringify(res.body)).toContain(res.status);
|
|
expect(mockApprovalService.create).toHaveBeenCalledWith(
|
|
"company-1",
|
|
expect.objectContaining({
|
|
type: "request_board_approval",
|
|
requestedByAgentId: "agent-1",
|
|
requestedByUserId: null,
|
|
status: "pending",
|
|
decisionNote: null,
|
|
}),
|
|
);
|
|
expect(mockSecretService.normalizeHireApprovalPayloadForPersistence).not.toHaveBeenCalled();
|
|
expect(mockIssueApprovalService.linkManyForApproval).toHaveBeenCalledWith(
|
|
"approval-1",
|
|
["00000000-0000-0000-0000-000000000001"],
|
|
{ agentId: "agent-1", userId: null },
|
|
);
|
|
expect(mockLogActivity).toHaveBeenCalledWith(
|
|
expect.anything(),
|
|
expect.objectContaining({
|
|
companyId: "company-1",
|
|
actorType: "agent",
|
|
actorId: "agent-1",
|
|
action: "approval.created",
|
|
}),
|
|
);
|
|
});
|
|
});
|