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>
286 lines
8.9 KiB
TypeScript
286 lines
8.9 KiB
TypeScript
import express from "express";
|
|
import request from "supertest";
|
|
import { beforeEach, describe, expect, it, vi } from "vitest";
|
|
|
|
const mockAccessService = vi.hoisted(() => ({
|
|
isInstanceAdmin: vi.fn(),
|
|
hasPermission: vi.fn(),
|
|
canUser: vi.fn(),
|
|
}));
|
|
|
|
const mockAgentService = vi.hoisted(() => ({
|
|
getById: vi.fn(),
|
|
}));
|
|
|
|
const mockBoardAuthService = vi.hoisted(() => ({
|
|
createCliAuthChallenge: vi.fn(),
|
|
describeCliAuthChallenge: vi.fn(),
|
|
approveCliAuthChallenge: vi.fn(),
|
|
cancelCliAuthChallenge: vi.fn(),
|
|
resolveBoardAccess: vi.fn(),
|
|
resolveBoardActivityCompanyIds: vi.fn(),
|
|
assertCurrentBoardKey: vi.fn(),
|
|
revokeBoardApiKey: vi.fn(),
|
|
}));
|
|
|
|
const mockLogActivity = vi.hoisted(() => vi.fn());
|
|
|
|
vi.mock("../services/index.js", () => ({
|
|
accessService: () => mockAccessService,
|
|
agentService: () => mockAgentService,
|
|
boardAuthService: () => mockBoardAuthService,
|
|
logActivity: mockLogActivity,
|
|
notifyHireApproved: vi.fn(),
|
|
deduplicateAgentName: vi.fn((name: string) => name),
|
|
}));
|
|
|
|
function registerModuleMocks() {
|
|
vi.doMock("../services/index.js", () => ({
|
|
accessService: () => mockAccessService,
|
|
agentService: () => mockAgentService,
|
|
boardAuthService: () => mockBoardAuthService,
|
|
logActivity: mockLogActivity,
|
|
notifyHireApproved: vi.fn(),
|
|
deduplicateAgentName: vi.fn((name: string) => name),
|
|
}));
|
|
}
|
|
|
|
async function createApp(actor: any, db: any = {} as any) {
|
|
const [{ accessRoutes }, { errorHandler }] = await Promise.all([
|
|
vi.importActual<typeof import("../routes/access.js")>("../routes/access.js"),
|
|
vi.importActual<typeof import("../middleware/index.js")>("../middleware/index.js"),
|
|
]);
|
|
const app = express();
|
|
app.use(express.json());
|
|
app.use((req, _res, next) => {
|
|
req.actor = actor;
|
|
next();
|
|
});
|
|
app.use(
|
|
"/api",
|
|
accessRoutes(db, {
|
|
deploymentMode: "authenticated",
|
|
deploymentExposure: "private",
|
|
bindHost: "127.0.0.1",
|
|
allowedHostnames: [],
|
|
}),
|
|
);
|
|
app.use(errorHandler);
|
|
return app;
|
|
}
|
|
|
|
describe("cli auth routes", () => {
|
|
beforeEach(() => {
|
|
vi.resetModules();
|
|
vi.doUnmock("../routes/access.js");
|
|
vi.doUnmock("../middleware/index.js");
|
|
registerModuleMocks();
|
|
vi.resetAllMocks();
|
|
});
|
|
|
|
it("creates a CLI auth challenge with approval metadata", async () => {
|
|
mockBoardAuthService.createCliAuthChallenge.mockResolvedValue({
|
|
challenge: {
|
|
id: "challenge-1",
|
|
expiresAt: new Date("2026-03-23T13:00:00.000Z"),
|
|
},
|
|
challengeSecret: "pcp_cli_auth_secret",
|
|
pendingBoardToken: "pcp_board_token",
|
|
});
|
|
|
|
const app = await createApp({ type: "none", source: "none" });
|
|
const res = await request(app)
|
|
.post("/api/cli-auth/challenges")
|
|
.send({
|
|
command: "paperclipai company import",
|
|
clientName: "paperclipai cli",
|
|
requestedAccess: "board",
|
|
});
|
|
|
|
expect(res.status).toBe(201);
|
|
expect(res.body).toMatchObject({
|
|
id: "challenge-1",
|
|
token: "pcp_cli_auth_secret",
|
|
approvalPath: "/cli-auth/challenge-1?token=pcp_cli_auth_secret",
|
|
pollPath: "/cli-auth/challenges/challenge-1",
|
|
expiresAt: "2026-03-23T13:00:00.000Z",
|
|
});
|
|
expect(res.body.boardApiToken).toBe("pcp_board_token");
|
|
expect(res.body.approvalUrl).toContain("/cli-auth/challenge-1?token=pcp_cli_auth_secret");
|
|
});
|
|
|
|
it("rejects anonymous access to generic skill documents", async () => {
|
|
const app = await createApp({ type: "none", source: "none" });
|
|
const [indexRes, skillRes] = await Promise.all([
|
|
request(app).get("/api/skills/index"),
|
|
request(app).get("/api/skills/paperclip"),
|
|
]);
|
|
|
|
expect(indexRes.status).toBe(401);
|
|
expect(skillRes.status).toBe(401);
|
|
});
|
|
|
|
it("serves the invite-scoped paperclip skill anonymously for active invites", async () => {
|
|
const invite = {
|
|
id: "invite-1",
|
|
companyId: "company-1",
|
|
inviteType: "company_join",
|
|
allowedJoinTypes: "agent",
|
|
tokenHash: "hash",
|
|
defaultsPayload: null,
|
|
expiresAt: new Date(Date.now() + 60_000),
|
|
invitedByUserId: null,
|
|
revokedAt: null,
|
|
acceptedAt: null,
|
|
createdAt: new Date(),
|
|
updatedAt: new Date(),
|
|
};
|
|
const db = {
|
|
select: vi.fn(() => ({
|
|
from: vi.fn(() => ({
|
|
where: vi.fn().mockResolvedValue([invite]),
|
|
})),
|
|
})),
|
|
};
|
|
|
|
const app = await createApp({ type: "none", source: "none" }, db);
|
|
const res = await request(app).get("/api/invites/token-123/skills/paperclip");
|
|
|
|
expect(res.status).toBe(200);
|
|
expect(res.headers["content-type"]).toContain("text/markdown");
|
|
expect(res.text).toContain("# Paperclip Skill");
|
|
});
|
|
|
|
it("marks challenge status as requiring sign-in for anonymous viewers", async () => {
|
|
mockBoardAuthService.describeCliAuthChallenge.mockResolvedValue({
|
|
id: "challenge-1",
|
|
status: "pending",
|
|
command: "paperclipai company import",
|
|
clientName: "paperclipai cli",
|
|
requestedAccess: "board",
|
|
requestedCompanyId: null,
|
|
requestedCompanyName: null,
|
|
approvedAt: null,
|
|
cancelledAt: null,
|
|
expiresAt: "2026-03-23T13:00:00.000Z",
|
|
approvedByUser: null,
|
|
});
|
|
|
|
const app = await createApp({ type: "none", source: "none" });
|
|
const res = await request(app).get("/api/cli-auth/challenges/challenge-1?token=pcp_cli_auth_secret");
|
|
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.requiresSignIn).toBe(true);
|
|
expect(res.body.canApprove).toBe(false);
|
|
});
|
|
|
|
it("approves a CLI auth challenge for a signed-in board user", async () => {
|
|
mockBoardAuthService.approveCliAuthChallenge.mockResolvedValue({
|
|
status: "approved",
|
|
challenge: {
|
|
id: "challenge-1",
|
|
boardApiKeyId: "board-key-1",
|
|
requestedAccess: "board",
|
|
requestedCompanyId: "company-1",
|
|
expiresAt: new Date("2026-03-23T13:00:00.000Z"),
|
|
},
|
|
});
|
|
mockBoardAuthService.resolveBoardAccess.mockResolvedValue({
|
|
user: { id: "user-1", name: "User One", email: "user@example.com" },
|
|
companyIds: ["company-1"],
|
|
isInstanceAdmin: false,
|
|
});
|
|
mockBoardAuthService.resolveBoardActivityCompanyIds.mockResolvedValue(["company-1"]);
|
|
|
|
const app = await createApp({
|
|
type: "board",
|
|
userId: "user-1",
|
|
source: "session",
|
|
isInstanceAdmin: false,
|
|
companyIds: ["company-1"],
|
|
});
|
|
const res = await request(app)
|
|
.post("/api/cli-auth/challenges/challenge-1/approve")
|
|
.send({ token: "pcp_cli_auth_secret" });
|
|
|
|
expect(res.status).toBe(200);
|
|
expect(mockBoardAuthService.approveCliAuthChallenge).toHaveBeenCalledWith(
|
|
"challenge-1",
|
|
"pcp_cli_auth_secret",
|
|
"user-1",
|
|
);
|
|
expect(mockLogActivity).toHaveBeenCalledTimes(1);
|
|
expect(mockLogActivity).toHaveBeenCalledWith(
|
|
expect.anything(),
|
|
expect.objectContaining({
|
|
companyId: "company-1",
|
|
action: "board_api_key.created",
|
|
}),
|
|
);
|
|
});
|
|
|
|
it("logs approve activity for instance admins without company memberships", async () => {
|
|
mockBoardAuthService.approveCliAuthChallenge.mockResolvedValue({
|
|
status: "approved",
|
|
challenge: {
|
|
id: "challenge-2",
|
|
boardApiKeyId: "board-key-2",
|
|
requestedAccess: "instance_admin_required",
|
|
requestedCompanyId: null,
|
|
expiresAt: new Date("2026-03-23T13:00:00.000Z"),
|
|
},
|
|
});
|
|
mockBoardAuthService.resolveBoardActivityCompanyIds.mockResolvedValue(["company-a", "company-b"]);
|
|
|
|
const app = await createApp({
|
|
type: "board",
|
|
userId: "admin-1",
|
|
source: "session",
|
|
isInstanceAdmin: true,
|
|
companyIds: [],
|
|
});
|
|
const res = await request(app)
|
|
.post("/api/cli-auth/challenges/challenge-2/approve")
|
|
.send({ token: "pcp_cli_auth_secret" });
|
|
|
|
expect(res.status).toBe(200);
|
|
expect(mockBoardAuthService.resolveBoardActivityCompanyIds).toHaveBeenCalledWith({
|
|
userId: "admin-1",
|
|
requestedCompanyId: null,
|
|
boardApiKeyId: "board-key-2",
|
|
});
|
|
expect(mockLogActivity).toHaveBeenCalledTimes(2);
|
|
});
|
|
|
|
it("logs revoke activity with resolved audit company ids", async () => {
|
|
mockBoardAuthService.assertCurrentBoardKey.mockResolvedValue({
|
|
id: "board-key-3",
|
|
userId: "admin-2",
|
|
});
|
|
mockBoardAuthService.resolveBoardActivityCompanyIds.mockResolvedValue(["company-z"]);
|
|
|
|
const app = await createApp({
|
|
type: "board",
|
|
userId: "admin-2",
|
|
keyId: "board-key-3",
|
|
source: "board_key",
|
|
isInstanceAdmin: true,
|
|
companyIds: [],
|
|
});
|
|
const res = await request(app).post("/api/cli-auth/revoke-current").send({});
|
|
|
|
expect(res.status).toBe(200);
|
|
expect(mockBoardAuthService.resolveBoardActivityCompanyIds).toHaveBeenCalledWith({
|
|
userId: "admin-2",
|
|
boardApiKeyId: "board-key-3",
|
|
});
|
|
expect(mockLogActivity).toHaveBeenCalledWith(
|
|
expect.anything(),
|
|
expect.objectContaining({
|
|
companyId: "company-z",
|
|
action: "board_api_key.revoked",
|
|
}),
|
|
);
|
|
});
|
|
});
|