diff --git a/server/src/__tests__/company-artifacts-service.test.ts b/server/src/__tests__/company-artifacts-service.test.ts index e8137ed48a9..91b5244c348 100644 --- a/server/src/__tests__/company-artifacts-service.test.ts +++ b/server/src/__tests__/company-artifacts-service.test.ts @@ -1,6 +1,6 @@ import { Readable } from "node:stream"; import express from "express"; -import { eq } from "drizzle-orm"; +import { eq, sql } from "drizzle-orm"; import request from "supertest"; import { afterAll, afterEach, beforeAll, describe, expect, it, vi } from "vitest"; import { @@ -405,6 +405,42 @@ describeEmbeddedPostgres("companyArtifactsService", () => { expect(incompatibleKind.body).toEqual({ artifacts: [], nextCursor: null }); }); + it("lists only artifacts on tasks the caller can read", async () => { + const previousMode = process.env.PAPERCLIP_ISSUE_PRIVACY_MODE; + process.env.PAPERCLIP_ISSUE_PRIVACY_MODE = "enforce"; + try { + const { companyId, issueId } = await seedArtifacts(); + await db.update(issues).set({ visibility: "private", privacyRootIssueId: sql`${issues.id}`, responsibleUserId: "owner-user" }) + .where(eq(issues.companyId, companyId)); + const list = async (userId: string, search = "limit=50") => { + const app = express(); + app.use((req, _res, next) => { + req.actor = { type: "board", userId, source: "session", companyIds: [companyId], + memberships: [{ companyId, membershipRole: "viewer", status: "active" }] }; + next(); + }); + app.use("/api/companies", companyRoutes(db, createStorageService())); + app.use(errorHandler); + return request(app).get(`/api/companies/${companyId}/artifacts?${search}`); + }; + const outsider = await list("user-1"); + expect(outsider.status).toBe(200); + expect(outsider.body.artifacts).toEqual([]); + expect((await list("owner-user")).body.artifacts.length).toBeGreaterThan(0); + // A task id in the group selector reveals nothing about an unreadable task. + for (const groupBy of ["task", "parent_task"]) { + const grouped = await list("user-1", `groupBy=${groupBy}&groupIssueId=${issueId}`); + expect(grouped.status).toBe(200); + expect(grouped.body).toEqual({ artifacts: [], selectedGroup: null, nextCursor: null }); + expect((await list("user-1", `groupBy=${groupBy}`)).body.artifacts).toEqual([]); + } + expect((await list("owner-user", `groupBy=task&groupIssueId=${issueId}`)).body.selectedGroup).toMatchObject({ issue: { id: issueId } }); + } finally { + if (previousMode === undefined) delete process.env.PAPERCLIP_ISSUE_PRIVACY_MODE; + else process.env.PAPERCLIP_ISSUE_PRIVACY_MODE = previousMode; + } + }); + it("returns an empty starred view for agent callers", async () => { const { companyId, otherRunId } = await seedArtifacts(); await db.insert(documentMemberships).values({ diff --git a/server/src/__tests__/company-search-service.test.ts b/server/src/__tests__/company-search-service.test.ts index a5d62e17e33..a2229adc020 100644 --- a/server/src/__tests__/company-search-service.test.ts +++ b/server/src/__tests__/company-search-service.test.ts @@ -394,6 +394,37 @@ describeEmbeddedPostgres("companySearchService", () => { expect(result.countsByType.document).toBe(1); }); + it("keeps private task artifacts out of an unrelated member's search", async () => { + const previousMode = process.env.PAPERCLIP_ISSUE_PRIVACY_MODE; + process.env.PAPERCLIP_ISSUE_PRIVACY_MODE = "enforce"; + try { + const companyId = await createCompany(); + const agentId = await createAgent(companyId, { name: "Private Writer" }); + const ownerId = `owner-${randomUUID()}`, outsiderId = `outsider-${randomUUID()}`; + const privateId = randomUUID(); + await createIssue(companyId, { id: privateId, title: "Confidential work", visibility: "private", + privacyRootIssueId: privateId, responsibleUserId: ownerId }); + const documentId = randomUUID(); + await db.insert(documents).values({ id: documentId, companyId, title: "Confidential draft", + latestBody: "Launch code nightjar-secret for internal review.", format: "markdown", createdByAgentId: agentId }); + await db.insert(issueDocuments).values({ companyId, issueId: privateId, documentId, key: "announcement" }); + const conditionFor = async (userId: string) => ({ + issueReadCondition: await issueReadSqlCondition(db, { type: "board", userId, source: "session" }), + }); + const query = companySearchQuerySchema.parse({ q: "nightjar-secret" }); + + const outsider = await svc.search(companyId, query, await conditionFor(outsiderId)); + expect(outsider.results.filter(row => row.type === "artifact")).toEqual([]); + expect(outsider.countsByType.artifact).toBe(0); + const owner = await svc.search(companyId, query, await conditionFor(ownerId)); + expect(owner.results.filter(row => row.type === "artifact")).toHaveLength(1); + expect(owner.countsByType.artifact).toBe(1); + } finally { + if (previousMode === undefined) delete process.env.PAPERCLIP_ISSUE_PRIVACY_MODE; + else process.env.PAPERCLIP_ISSUE_PRIVACY_MODE = previousMode; + } + }); + it("searches artifact projections through the artifacts scope", async () => { const companyId = await createCompany(); const agentId = await createAgent(companyId, { name: "Artifact Writer" }); diff --git a/server/src/routes/companies.ts b/server/src/routes/companies.ts index 007a3e804d5..575b242bbf6 100644 --- a/server/src/routes/companies.ts +++ b/server/src/routes/companies.ts @@ -35,7 +35,7 @@ import { type CompanyImportTransferStatus, } from "@paperclipai/shared/company-import-transfer"; import { badRequest, conflict, forbidden, notFound, unprocessable } from "../errors.js"; -import { authorizationDeniedDetails } from "../services/authorization.js"; +import { authorizationDeniedDetails, issueReadSqlCondition } from "../services/authorization.js"; import { PORTABLE_ZIP_UPLOAD_LIMIT_BYTES } from "../http/body-limits.js"; import { logger } from "../middleware/logger.js"; import { validate } from "../middleware/validate.js"; @@ -427,6 +427,7 @@ export function companyRoutes(db: Db, storage?: StorageService, options?: Compan const query = companyArtifactsQuerySchema.parse(req.query); res.json(await artifacts.list(companyId, query, { userId: query.starred && req.actor.type === "board" ? req.actor.userId : undefined, + readCondition: await issueReadSqlCondition(db, req.actor), })); }); diff --git a/server/src/services/company-artifacts.ts b/server/src/services/company-artifacts.ts index 621e90ee037..d9ec46fedb3 100644 --- a/server/src/services/company-artifacts.ts +++ b/server/src/services/company-artifacts.ts @@ -195,7 +195,7 @@ function pageByCursor( return { page, nextCursor }; } -async function loadIssueGroupingRows(db: Db, companyId: string, seedIssueIds: Iterable) { +async function loadIssueGroupingRows(db: Db, companyId: string, seedIssueIds: Iterable, readCondition?: SQL) { const rowsById = new Map(); let pending = [...new Set(seedIssueIds)]; @@ -209,7 +209,7 @@ async function loadIssueGroupingRows(db: Db, companyId: string, seedIssueIds: It updatedAt: issues.updatedAt, }) .from(issues) - .where(and(eq(issues.companyId, companyId), inArray(issues.id, pending))); + .where(and(eq(issues.companyId, companyId), inArray(issues.id, pending), readCondition)); const nextPending = new Set(); for (const row of rows) { @@ -321,7 +321,8 @@ export function companyArtifactsService(db: Db, storage?: StorageService) { list: async ( companyId: string, rawQuery: Partial = {}, - options: { issueConditions?: SQL[]; userId?: string } = {}, + /** `readCondition` limits artifacts and group tasks to tasks the caller can read. */ + options: { issueConditions?: SQL[]; readCondition?: SQL; userId?: string } = {}, ): Promise => { const query = companyArtifactsQuerySchema.parse(rawQuery); const cursor = decodeCursor(query.cursor); @@ -344,6 +345,7 @@ export function companyArtifactsService(db: Db, storage?: StorageService) { isNull(issues.hiddenAt), isNull(issues.harnessKind), ...(options.issueConditions ?? []), + ...(options.readCondition ? [options.readCondition] : []), ]; const artifacts: CompanyArtifact[] = []; const artifactSortDates = new Map(); @@ -742,7 +744,7 @@ export function companyArtifactsService(db: Db, storage?: StorageService) { const issueSeedIds = new Set(artifacts.map((artifact) => artifact.issue.id)); if (query.groupIssueId) issueSeedIds.add(query.groupIssueId); - const issueRows = await loadIssueGroupingRows(db, companyId, issueSeedIds); + const issueRows = await loadIssueGroupingRows(db, companyId, issueSeedIds, options.readCondition); const groups = buildArtifactGroups({ artifacts: sorted, companyPrefix: company.issuePrefix, diff --git a/server/src/services/company-search.ts b/server/src/services/company-search.ts index 5e7dd2116ac..b7083891d9e 100644 --- a/server/src/services/company-search.ts +++ b/server/src/services/company-search.ts @@ -951,6 +951,7 @@ export function companySearchService(db: Db) { eq(issues.companyId, companyId), visibleIssueCondition(), ...artifactIssueFilters, + ...(options?.issueReadCondition ? [options.issueReadCondition] : []), ]; const documentArtifactConditions = [ eq(issueDocuments.companyId, companyId), @@ -1035,7 +1036,7 @@ export function companySearchService(db: Db) { const result = await companyArtifactsService(db).list(companyId, { q: normalizedQuery.slice(0, COMPANY_ARTIFACTS_MAX_QUERY_LENGTH), limit: Math.min(fetchLimit, COMPANY_ARTIFACTS_MAX_LIMIT), - }, { issueConditions: issueFilters }); + }, { issueConditions: issueFilters, readCondition: options?.issueReadCondition }); return result.artifacts; }