Skip to content

Commit 1d59a56

Browse files
fix(gitcafe): reject repeated diff pagination cursors
1 parent e1a5c04 commit 1d59a56

2 files changed

Lines changed: 30 additions & 0 deletions

File tree

‎packages/source-control-gitcafe/src/server/GitCafePullRequestProvider.test.ts‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,34 @@ describe("GitCafePullRequestProvider changed paths", () => {
222222
},
223223
);
224224

225+
it.effect.each(["getDiff", "getDiffFilePaths"] as const)(
226+
"%s rejects a repeated continuation cursor",
227+
(operation) => {
228+
const server = fakeGitCafe({
229+
"GET /repos/owner/repo/pulls/7": pull,
230+
"GET /repos/owner/repo/pulls/7/changes": {
231+
...snapshot,
232+
items: [],
233+
next: "same-page",
234+
},
235+
});
236+
return Effect.gen(function* () {
237+
const provider = yield* GitCafePullRequestProvider.make;
238+
const first = yield* provider[operation]!(target);
239+
const input = { ...target, cursor: first.nextCursor! };
240+
const result =
241+
operation === "getDiff"
242+
? yield* provider.getDiff(input).pipe(Effect.result)
243+
: yield* provider.getDiffFilePaths!(input).pipe(Effect.result);
244+
assert.strictEqual(result._tag, "Failure");
245+
assert.strictEqual(
246+
server.sent.filter((request) => request.path.endsWith("/changes")).length,
247+
2,
248+
);
249+
}).pipe(Effect.provide(server.layer));
250+
},
251+
);
252+
225253
it.effect.each([{ version: 5 }, { headOid: baseOid }, { comparisonBaseOid: headOid }])(
226254
"refuses metadata pages from different comparison snapshots (%j)",
227255
(changed) => {

‎packages/source-control-gitcafe/src/server/GitCafePullRequestProvider.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -551,6 +551,8 @@ export const make = Effect.gen(function* () {
551551
operation,
552552
"GitCafe answered from a different revision of the pull request. Refresh the diff.",
553553
);
554+
if (cursor !== null && page.next !== null && page.next === cursor.after)
555+
return yield* failure(operation, "GitCafe returned a repeated diff page cursor.");
554556
const revision = { version, headOid: page.headOid, baseOid: page.comparisonBaseOid };
555557
return {
556558
items: page.items,

0 commit comments

Comments
 (0)