Skip to content

fix(queue): honor autoCloseExemptLogins in the repeated-draft-cycling review-evasion guard #6217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
loopover-orb merged 1 commit into from
Jul 15, 2026
Merged

fix(queue): honor autoCloseExemptLogins in the repeated-draft-cycling review-evasion guard #6217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/queue/review-evasion.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -966,6 +966,9 @@ async function closeRepeatedDraftCyclingIfDetected(
/* v8 ignore next -- unreachable given the call site's own author-only increment guarantee; see comment above. */
if (!converter || !authorLogin || converter !== authorLogin) return;
if (isProtectedAutomationAuthor(pr.authorLogin)) return;
// Honor the maintainer's trusted-contributor allowlist, same as the two sibling review-evasion guards
// (closeReviewEvasionSelfCloseIfReviewed / closeReviewEvasionDraftConversionIfReviewed) already do (#6165).
if (isAutoCloseExempt(pr.authorLogin, settings.autoCloseExemptLogins)) return;
if (!pr.headSha) return;
const headSha = pr.headSha;
if (await hasMaintainerOrOwnerPermission(env, installationId, repoFullName, authorLogin)) return;
Expand Down
16 changes: 16 additions & 0 deletions test/unit/queue-lifecycle-guards.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2952,6 +2952,22 @@ describe("review-evasion protection (#review-evasion-protection)", () => {
expect(strike?.outcome).toBe("completed");
});

it("REGRESSION (#6165): honors settings.autoCloseExemptLogins -- the shared allowlist the two sibling review-evasion guards already use, even after a repeated cycle", async () => {
const calls: Array<{ url: string; method: string }> = [];
stubEvasionFetch(calls);
const env = createTestEnv({ GITHUB_APP_PRIVATE_KEY: generateRsaPrivateKeyPem(), GITHUB_APP_SLUG: "gittensory" });
await setupEvasionRepo(env, { autoCloseExemptLogins: ["contributor"] });
await repositoriesModule.upsertGlobalModerationConfig(env, { enabled: true, rules: ["review_evasion"] });

await processJob(env, { type: "github-webhook", deliveryId: "draft-cycle-exempt-1", eventName: "pull_request", payload: draftEvasionPayload("contributor") });
await processJob(env, { type: "github-webhook", deliveryId: "draft-cycle-exempt-2", eventName: "pull_request", payload: draftEvasionPayload("contributor") });

// Exempt author: the repeated-draft-cycling guard must skip enforcement just like its two siblings do.
expect(calls.some((c) => c.method === "PATCH" && c.url.endsWith("/pulls/42"))).toBe(false);
const audit = await env.DB.prepare("select count(*) as n from audit_events where event_type = ?").bind("github_app.review_evasion_closed").first<{ n: number }>();
expect(audit?.n).toBe(0);
});

it("does nothing when reviewEvasionProtection is off, even after a repeated cycle", async () => {
const calls: Array<{ url: string; method: string }> = [];
stubEvasionFetch(calls);
Expand Down