forked from farhoodlabs/paperclip
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>
268 lines
7.9 KiB
TypeScript
268 lines
7.9 KiB
TypeScript
import express from "express";
|
|
import request from "supertest";
|
|
import { beforeEach, describe, expect, it, vi } from "vitest";
|
|
import { errorHandler } from "../middleware/index.js";
|
|
import { agentRoutes } from "../routes/agents.js";
|
|
|
|
const agentId = "11111111-1111-4111-8111-111111111111";
|
|
const companyId = "22222222-2222-4222-8222-222222222222";
|
|
const keyId = "33333333-3333-4333-8333-333333333333";
|
|
|
|
const baseAgent = {
|
|
id: agentId,
|
|
companyId,
|
|
name: "Builder",
|
|
urlKey: "builder",
|
|
role: "engineer",
|
|
title: "Builder",
|
|
icon: null,
|
|
status: "idle",
|
|
reportsTo: null,
|
|
capabilities: null,
|
|
adapterType: "process",
|
|
adapterConfig: {},
|
|
runtimeConfig: {},
|
|
budgetMonthlyCents: 0,
|
|
spentMonthlyCents: 0,
|
|
pauseReason: null,
|
|
pausedAt: null,
|
|
permissions: { canCreateAgents: false },
|
|
lastHeartbeatAt: null,
|
|
metadata: null,
|
|
createdAt: new Date("2026-04-11T00:00:00.000Z"),
|
|
updatedAt: new Date("2026-04-11T00:00:00.000Z"),
|
|
};
|
|
|
|
const baseKey = {
|
|
id: keyId,
|
|
agentId,
|
|
companyId,
|
|
name: "exploit",
|
|
createdAt: new Date("2026-04-11T00:00:00.000Z"),
|
|
revokedAt: null,
|
|
};
|
|
|
|
const mockAgentService = vi.hoisted(() => ({
|
|
getById: vi.fn(),
|
|
pause: vi.fn(),
|
|
resume: vi.fn(),
|
|
terminate: vi.fn(),
|
|
remove: vi.fn(),
|
|
listKeys: vi.fn(),
|
|
createApiKey: vi.fn(),
|
|
getKeyById: vi.fn(),
|
|
revokeKey: vi.fn(),
|
|
}));
|
|
|
|
const mockAccessService = vi.hoisted(() => ({
|
|
canUser: vi.fn(),
|
|
hasPermission: vi.fn(),
|
|
getMembership: vi.fn(),
|
|
ensureMembership: vi.fn(),
|
|
listPrincipalGrants: vi.fn(),
|
|
setPrincipalPermission: vi.fn(),
|
|
}));
|
|
|
|
const mockApprovalService = vi.hoisted(() => ({
|
|
create: vi.fn(),
|
|
getById: vi.fn(),
|
|
}));
|
|
|
|
const mockBudgetService = vi.hoisted(() => ({
|
|
upsertPolicy: vi.fn(),
|
|
}));
|
|
|
|
const mockHeartbeatService = vi.hoisted(() => ({
|
|
cancelActiveForAgent: vi.fn(),
|
|
}));
|
|
|
|
const mockIssueApprovalService = vi.hoisted(() => ({
|
|
linkManyForApproval: vi.fn(),
|
|
}));
|
|
|
|
const mockIssueService = vi.hoisted(() => ({
|
|
list: vi.fn(),
|
|
}));
|
|
|
|
const mockSecretService = vi.hoisted(() => ({
|
|
normalizeAdapterConfigForPersistence: vi.fn(),
|
|
resolveAdapterConfigForRuntime: vi.fn(),
|
|
}));
|
|
|
|
const mockAgentInstructionsService = vi.hoisted(() => ({
|
|
materializeManagedBundle: vi.fn(),
|
|
}));
|
|
|
|
const mockCompanySkillService = vi.hoisted(() => ({
|
|
listRuntimeSkillEntries: vi.fn(),
|
|
resolveRequestedSkillKeys: vi.fn(),
|
|
}));
|
|
|
|
const mockWorkspaceOperationService = vi.hoisted(() => ({}));
|
|
const mockLogActivity = vi.hoisted(() => vi.fn());
|
|
const mockGetTelemetryClient = vi.hoisted(() => vi.fn());
|
|
|
|
vi.mock("@paperclipai/shared/telemetry", () => ({
|
|
trackAgentCreated: vi.fn(),
|
|
trackErrorHandlerCrash: vi.fn(),
|
|
}));
|
|
|
|
vi.mock("../telemetry.js", () => ({
|
|
getTelemetryClient: mockGetTelemetryClient,
|
|
}));
|
|
|
|
vi.mock("../services/index.js", () => ({
|
|
agentService: () => mockAgentService,
|
|
agentInstructionsService: () => mockAgentInstructionsService,
|
|
accessService: () => mockAccessService,
|
|
approvalService: () => mockApprovalService,
|
|
companySkillService: () => mockCompanySkillService,
|
|
budgetService: () => mockBudgetService,
|
|
heartbeatService: () => mockHeartbeatService,
|
|
issueApprovalService: () => mockIssueApprovalService,
|
|
issueService: () => mockIssueService,
|
|
logActivity: mockLogActivity,
|
|
secretService: () => mockSecretService,
|
|
syncInstructionsBundleConfigFromFilePath: vi.fn((_agent, config) => config),
|
|
workspaceOperationService: () => mockWorkspaceOperationService,
|
|
}));
|
|
|
|
vi.mock("../services/instance-settings.js", () => ({
|
|
instanceSettingsService: () => ({
|
|
getGeneral: vi.fn(async () => ({ censorUsernameInLogs: false })),
|
|
}),
|
|
}));
|
|
|
|
function createApp(actor: Record<string, unknown>) {
|
|
const app = express();
|
|
app.use(express.json());
|
|
app.use((req, _res, next) => {
|
|
(req as any).actor = actor;
|
|
next();
|
|
});
|
|
app.use("/api", agentRoutes({} as any));
|
|
app.use(errorHandler);
|
|
return app;
|
|
}
|
|
|
|
describe("agent cross-tenant route authorization", () => {
|
|
beforeEach(() => {
|
|
vi.clearAllMocks();
|
|
mockGetTelemetryClient.mockReturnValue({ track: vi.fn() });
|
|
mockAgentService.getById.mockResolvedValue(baseAgent);
|
|
mockAgentService.pause.mockResolvedValue(baseAgent);
|
|
mockAgentService.resume.mockResolvedValue(baseAgent);
|
|
mockAgentService.terminate.mockResolvedValue(baseAgent);
|
|
mockAgentService.remove.mockResolvedValue(baseAgent);
|
|
mockAgentService.listKeys.mockResolvedValue([]);
|
|
mockAgentService.createApiKey.mockResolvedValue({
|
|
id: keyId,
|
|
name: baseKey.name,
|
|
token: "pcp_test_token",
|
|
createdAt: baseKey.createdAt,
|
|
});
|
|
mockAgentService.getKeyById.mockResolvedValue(baseKey);
|
|
mockAgentService.revokeKey.mockResolvedValue({
|
|
...baseKey,
|
|
revokedAt: new Date("2026-04-11T00:05:00.000Z"),
|
|
});
|
|
mockHeartbeatService.cancelActiveForAgent.mockResolvedValue(undefined);
|
|
mockLogActivity.mockResolvedValue(undefined);
|
|
});
|
|
|
|
it("rejects cross-tenant board pause before mutating the agent", async () => {
|
|
const app = createApp({
|
|
type: "board",
|
|
userId: "mallory",
|
|
companyIds: [],
|
|
source: "session",
|
|
isInstanceAdmin: false,
|
|
});
|
|
|
|
const res = await request(app).post(`/api/agents/${agentId}/pause`).send({});
|
|
|
|
expect(res.status).toBe(403);
|
|
expect(res.body.error).toContain("User does not have access to this company");
|
|
expect(mockAgentService.getById).toHaveBeenCalledWith(agentId);
|
|
expect(mockAgentService.pause).not.toHaveBeenCalled();
|
|
expect(mockHeartbeatService.cancelActiveForAgent).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it("rejects cross-tenant board key listing before reading any keys", async () => {
|
|
const app = createApp({
|
|
type: "board",
|
|
userId: "mallory",
|
|
companyIds: [],
|
|
source: "session",
|
|
isInstanceAdmin: false,
|
|
});
|
|
|
|
const res = await request(app).get(`/api/agents/${agentId}/keys`);
|
|
|
|
expect(res.status).toBe(403);
|
|
expect(res.body.error).toContain("User does not have access to this company");
|
|
expect(mockAgentService.getById).toHaveBeenCalledWith(agentId);
|
|
expect(mockAgentService.listKeys).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it("rejects cross-tenant board key creation before minting a token", async () => {
|
|
const app = createApp({
|
|
type: "board",
|
|
userId: "mallory",
|
|
companyIds: [],
|
|
source: "session",
|
|
isInstanceAdmin: false,
|
|
});
|
|
|
|
const res = await request(app)
|
|
.post(`/api/agents/${agentId}/keys`)
|
|
.send({ name: "exploit" });
|
|
|
|
expect(res.status).toBe(403);
|
|
expect(res.body.error).toContain("User does not have access to this company");
|
|
expect(mockAgentService.getById).toHaveBeenCalledWith(agentId);
|
|
expect(mockAgentService.createApiKey).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it("rejects cross-tenant board key revocation before touching the key", async () => {
|
|
const app = createApp({
|
|
type: "board",
|
|
userId: "mallory",
|
|
companyIds: [],
|
|
source: "session",
|
|
isInstanceAdmin: false,
|
|
});
|
|
|
|
const res = await request(app).delete(`/api/agents/${agentId}/keys/${keyId}`);
|
|
|
|
expect(res.status).toBe(403);
|
|
expect(res.body.error).toContain("User does not have access to this company");
|
|
expect(mockAgentService.getById).toHaveBeenCalledWith(agentId);
|
|
expect(mockAgentService.getKeyById).not.toHaveBeenCalled();
|
|
expect(mockAgentService.revokeKey).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it("requires the key to belong to the route agent before revocation", async () => {
|
|
mockAgentService.getKeyById.mockResolvedValue({
|
|
...baseKey,
|
|
agentId: "44444444-4444-4444-8444-444444444444",
|
|
});
|
|
mockAccessService.canUser.mockResolvedValue(true);
|
|
|
|
const app = createApp({
|
|
type: "board",
|
|
userId: "board-user",
|
|
companyIds: [companyId],
|
|
source: "session",
|
|
isInstanceAdmin: false,
|
|
});
|
|
|
|
const res = await request(app).delete(`/api/agents/${agentId}/keys/${keyId}`);
|
|
|
|
expect(res.status).toBe(404);
|
|
expect(res.body.error).toContain("Key not found");
|
|
expect(mockAgentService.getKeyById).toHaveBeenCalledWith(keyId);
|
|
expect(mockAgentService.revokeKey).not.toHaveBeenCalled();
|
|
});
|
|
});
|