Skip to content

Commit 03bbe57

Browse files
Ben ThomasCopilot
authored andcommitted
fix(hub): preserve review authority
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
1 parent deddf6f commit 03bbe57

19 files changed

Lines changed: 264 additions & 18 deletions

File tree

‎hub/server/create-app/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export function createApp({
3737
authenticationSecurity(),
3838
)
3939
app.use(
40-
/^(?!\/api\/copilot-connection(?:\/|$))(?!\/api\/(?:auth|administrators\/authorizations|session-revocation\/authorizations)(?:\/|$))(?!\/api\/repositories\/[^/]+\/prototypes\/[^/]+\/?$).*/i,
40+
/^(?!\/api\/copilot-connection(?:\/|$))(?!\/api\/(?:auth|administrators\/authorizations|session-revocation\/authorizations)(?:\/|$))(?!\/api\/repositories\/[^/]+\/prototypes\/[^/]+(?:\/review-comments(?:\/|$)|\/?$)).*/i,
4141
express.json(),
4242
)
4343

‎hub/server/domains/review-comments/create-review-comment-service/index.test.ts‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,44 @@
11
import { describe, expect, it, vi } from "vitest"
22

3+
import type { PrismaClient } from "../../../generated/prisma/client.ts"
4+
35
import { createReviewCommentService } from "."
46

57
describe("createReviewCommentService()", () => {
8+
it("rejects a mutation when transaction-bound session authority is gone", async () => {
9+
const transaction = vi.fn(async (operation: (client: never) => Promise<unknown>) =>
10+
operation({} as never),
11+
)
12+
const service = createReviewCommentService(
13+
{ $transaction: transaction } as unknown as Pick<PrismaClient, "$transaction">,
14+
() => Promise.resolve(false),
15+
)
16+
17+
await expect(
18+
service.deleteComment({
19+
sessionDigest: "a".repeat(64),
20+
repositoryId: "4bb7f30d-d68e-45c7-b15f-a5e1bcd6ac43",
21+
prototypeId: "ddcbd25d-72b4-45be-9324-677b4ca04dac",
22+
commentId: 1,
23+
actor: {
24+
userId: "1d92c847-f217-4c48-9824-e25d4a36f821",
25+
login: "mona",
26+
name: "Mona",
27+
},
28+
}),
29+
).rejects.toMatchObject({
30+
code: "unauthorized",
31+
message: "Sign in to continue.",
32+
})
33+
})
34+
635
it("returns a conflict after bounded transaction retries are exhausted", async () => {
736
const transaction = vi.fn().mockRejectedValue({ originalCode: "40001" })
837
const service = createReviewCommentService({ $transaction: transaction })
938

1039
await expect(
1140
service.deleteComment({
41+
sessionDigest: "a".repeat(64),
1242
repositoryId: "4bb7f30d-d68e-45c7-b15f-a5e1bcd6ac43",
1343
prototypeId: "ddcbd25d-72b4-45be-9324-677b4ca04dac",
1444
commentId: 1,

‎hub/server/domains/review-comments/create-review-comment-service/index.ts‎

Lines changed: 44 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ function persistenceError(reason: ReviewPersistenceFailure): ReviewCommentError
3535
return new ReviewCommentError("not_found", "Reviewable prototype not found.")
3636
case "repository_not_found":
3737
return new ReviewCommentError("not_found", "Repository not found.")
38+
case "session_invalid":
39+
return new ReviewCommentError("unauthorized", "Sign in to continue.")
3840
case "thread_not_found":
3941
return new ReviewCommentError("not_found", "Review thread not found.")
4042
}
@@ -56,6 +58,11 @@ async function runReviewMutation<Result>(operation: () => Promise<Result>): Prom
5658

5759
export function createReviewCommentService(
5860
database: Pick<PrismaClient, "$transaction">,
61+
authorizeMutation: (
62+
transaction: Prisma.TransactionClient,
63+
sessionDigest: string,
64+
userId: string,
65+
) => Promise<boolean> = () => Promise.resolve(true),
5966
): ReviewCommentService {
6067
const repository = createReviewCommentRepository(database)
6168
return {
@@ -68,30 +75,62 @@ export function createReviewCommentService(
6875
const body = parseReviewBody(input.body)
6976
const anchor = parseReviewAnchor(input.anchor) as unknown as Prisma.InputJsonValue
7077
const result = await runReviewMutation(() =>
71-
repository.createThread({ ...input, body, anchor }),
78+
repository.createThread({
79+
...input,
80+
body,
81+
anchor,
82+
authorize: (transaction) =>
83+
authorizeMutation(transaction, input.sessionDigest, input.actor.userId),
84+
}),
7285
)
7386
if (!result.ok) throw persistenceError(result.reason)
7487
return serializeReviewThread(result.value)
7588
},
7689
async createReply(input) {
7790
const body = parseReviewBody(input.body)
78-
const result = await runReviewMutation(() => repository.createReply({ ...input, body }))
91+
const result = await runReviewMutation(() =>
92+
repository.createReply({
93+
...input,
94+
body,
95+
authorize: (transaction) =>
96+
authorizeMutation(transaction, input.sessionDigest, input.actor.userId),
97+
}),
98+
)
7999
if (!result.ok) throw persistenceError(result.reason)
80100
return serializeReviewThread(result.value)
81101
},
82102
async editComment(input) {
83103
const body = parseReviewBody(input.body)
84-
const result = await runReviewMutation(() => repository.editComment({ ...input, body }))
104+
const result = await runReviewMutation(() =>
105+
repository.editComment({
106+
...input,
107+
body,
108+
authorize: (transaction) =>
109+
authorizeMutation(transaction, input.sessionDigest, input.actor.userId),
110+
}),
111+
)
85112
if (!result.ok) throw persistenceError(result.reason)
86113
return serializeReviewThread(result.value)
87114
},
88115
async deleteComment(input) {
89-
const result = await runReviewMutation(() => repository.deleteComment(input))
116+
const result = await runReviewMutation(() =>
117+
repository.deleteComment({
118+
...input,
119+
authorize: (transaction) =>
120+
authorizeMutation(transaction, input.sessionDigest, input.actor.userId),
121+
}),
122+
)
90123
if (!result.ok) throw persistenceError(result.reason)
91124
return serializeReviewThread(result.value)
92125
},
93126
async setResolution(input) {
94-
const result = await runReviewMutation(() => repository.setResolution(input))
127+
const result = await runReviewMutation(() =>
128+
repository.setResolution({
129+
...input,
130+
authorize: (transaction) =>
131+
authorizeMutation(transaction, input.sessionDigest, input.actor.userId),
132+
}),
133+
)
95134
if (!result.ok) throw persistenceError(result.reason)
96135
return serializeReviewThread(result.value)
97136
},

‎hub/server/domains/review-comments/errors.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export type ReviewCommentErrorCode =
2-
"conflict" | "forbidden" | "invalid" | "not_found" | "unprocessable"
2+
"conflict" | "forbidden" | "invalid" | "not_found" | "unprocessable" | "unauthorized"
33

44
export class ReviewCommentError extends Error {
55
readonly code: ReviewCommentErrorCode

‎hub/server/domains/review-comments/review-comments.db.test.ts‎

Lines changed: 71 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ import { prisma } from "../../integrations/prisma"
55

66
import { captureRepositoryReviewSnapshot } from "./capture-repository-review-snapshot"
77
import { createReviewCommentService } from "./create-review-comment-service"
8+
import type { ReviewCommentService } from "./types"
9+
10+
const sessionDigest = "a".repeat(64)
811

912
const anchor = {
1013
schemaVersion: 1 as const,
@@ -77,14 +80,37 @@ async function createRepository(nameWithOwner = "team/reviewable") {
7780
})
7881
}
7982

83+
function createTestReviewService() {
84+
const service = createReviewCommentService(prisma)
85+
return {
86+
createThread: (
87+
input: Omit<Parameters<ReviewCommentService["createThread"]>[0], "sessionDigest">,
88+
) => service.createThread({ ...input, sessionDigest }),
89+
createReply: (
90+
input: Omit<Parameters<ReviewCommentService["createReply"]>[0], "sessionDigest">,
91+
) => service.createReply({ ...input, sessionDigest }),
92+
editComment: (
93+
input: Omit<Parameters<ReviewCommentService["editComment"]>[0], "sessionDigest">,
94+
) => service.editComment({ ...input, sessionDigest }),
95+
deleteComment: (
96+
input: Omit<Parameters<ReviewCommentService["deleteComment"]>[0], "sessionDigest">,
97+
) => service.deleteComment({ ...input, sessionDigest }),
98+
setResolution: (
99+
input: Omit<Parameters<ReviewCommentService["setResolution"]>[0], "sessionDigest">,
100+
) => service.setResolution({ ...input, sessionDigest }),
101+
listPrototypeThreads: (repositoryId: string, prototypeId: string) =>
102+
service.listPrototypeThreads(repositoryId, prototypeId),
103+
}
104+
}
105+
80106
describe("review comments", () => {
81107
it("stores stable root identity and flat replies without crossing prototype scope", async () => {
82108
const repository = await createRepository()
83109
const first = await createReviewablePrototype(repository.id, "prototype/checkout", 7)
84110
const second = await createReviewablePrototype(repository.id, "prototype/profile", 7)
85111
const author = await createUser("mona", "Mona Lisa")
86112
const reviewer = await createUser("hubot", "Hubot")
87-
const service = createReviewCommentService(prisma)
113+
const service = createTestReviewService()
88114

89115
const thread = await service.createThread({
90116
repositoryId: repository.id,
@@ -153,11 +179,25 @@ describe("review comments", () => {
153179
const repository = await createRepository()
154180
const first = await createReviewablePrototype(repository.id, "prototype/checkout", 1)
155181
const second = await createReviewablePrototype(repository.id, "prototype/profile", 2)
182+
const draft = await prisma.prototype.create({
183+
data: {
184+
repositoryId: repository.id,
185+
branchName: "prototype/draft",
186+
},
187+
})
188+
const draftBuild = await prisma.build.create({
189+
data: { prototypeId: draft.id, number: 1, state: "successful" },
190+
})
191+
const deleted = await createReviewablePrototype(repository.id, "prototype/deleted", 1)
192+
await prisma.prototype.update({
193+
where: { id: deleted.prototype.id },
194+
data: { branchDeletedAt: new Date("2026-11-15T00:00:00Z") },
195+
})
156196
const failed = await prisma.build.create({
157197
data: { prototypeId: first.prototype.id, number: 3, state: "failed" },
158198
})
159199
const author = await createUser("mona", "Mona")
160-
const service = createReviewCommentService(prisma)
200+
const service = createTestReviewService()
161201

162202
const invalidInputs = [
163203
{ body: " ", anchor },
@@ -200,6 +240,32 @@ describe("review comments", () => {
200240
actor: author,
201241
}),
202242
).rejects.toMatchObject({ code: "not_found" })
243+
await expect(
244+
service.createThread({
245+
repositoryId: repository.id,
246+
prototypeId: draft.id,
247+
buildNumber: draftBuild.number,
248+
body: "Draft branch",
249+
anchor,
250+
actor: author,
251+
}),
252+
).rejects.toMatchObject({ code: "not_found" })
253+
await expect(
254+
service.createThread({
255+
repositoryId: repository.id,
256+
prototypeId: deleted.prototype.id,
257+
buildNumber: deleted.build.number,
258+
body: "Deleted branch",
259+
anchor,
260+
actor: author,
261+
}),
262+
).rejects.toMatchObject({ code: "not_found" })
263+
await expect(service.listPrototypeThreads(repository.id, draft.id)).rejects.toMatchObject({
264+
code: "not_found",
265+
})
266+
await expect(
267+
service.listPrototypeThreads(repository.id, deleted.prototype.id),
268+
).rejects.toMatchObject({ code: "not_found" })
203269
})
204270

205271
it("permanently clears deleted text while retaining comment identity and position", async () => {
@@ -209,7 +275,7 @@ describe("review comments", () => {
209275
"prototype/checkout",
210276
)
211277
const author = await createUser("mona", "Mona")
212-
const service = createReviewCommentService(prisma)
278+
const service = createTestReviewService()
213279
const thread = await service.createThread({
214280
repositoryId: repository.id,
215281
prototypeId: prototype.id,
@@ -269,7 +335,7 @@ describe("review comments", () => {
269335
const author = await createUser("mona", "Mona")
270336
const firstReviewer = await createUser("hubot", "Hubot")
271337
const secondReviewer = await createUser("octocat", "The Octocat")
272-
const service = createReviewCommentService(prisma)
338+
const service = createTestReviewService()
273339
const thread = await service.createThread({
274340
repositoryId: repository.id,
275341
prototypeId: prototype.id,
@@ -333,7 +399,7 @@ describe("review comments", () => {
333399
const second = await createReviewablePrototype(repository.id, "prototype/profile", 9)
334400
const author = await createUser("mona", "Mona")
335401
const reviewer = await createUser("hubot", null)
336-
const service = createReviewCommentService(prisma)
402+
const service = createTestReviewService()
337403
const firstThread = await service.createThread({
338404
repositoryId: repository.id,
339405
prototypeId: first.prototype.id,

‎hub/server/domains/review-comments/types.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ export type ReviewRouteActor = ReviewActor
6060
export interface ReviewCommentService {
6161
listPrototypeThreads(repositoryId: string, prototypeId: string): Promise<ReviewThread[]>
6262
createThread(input: {
63+
sessionDigest: string
6364
repositoryId: string
6465
prototypeId: string
6566
buildNumber: number
@@ -68,26 +69,30 @@ export interface ReviewCommentService {
6869
actor: ReviewRouteActor
6970
}): Promise<ReviewThread>
7071
createReply(input: {
72+
sessionDigest: string
7173
repositoryId: string
7274
prototypeId: string
7375
threadId: number
7476
body: unknown
7577
actor: ReviewRouteActor
7678
}): Promise<ReviewThread>
7779
editComment(input: {
80+
sessionDigest: string
7881
repositoryId: string
7982
prototypeId: string
8083
commentId: number
8184
body: unknown
8285
actor: ReviewRouteActor
8386
}): Promise<ReviewThread>
8487
deleteComment(input: {
88+
sessionDigest: string
8589
repositoryId: string
8690
prototypeId: string
8791
commentId: number
8892
actor: ReviewRouteActor
8993
}): Promise<ReviewThread>
9094
setResolution(input: {
95+
sessionDigest: string
9196
repositoryId: string
9297
prototypeId: string
9398
threadId: number

0 commit comments

Comments
 (0)