Skip to content

fix(settings): parse PROTECTED_AUTOCLOSE_AUTHORS_EXTRA via the shared login-list parser (#audit-3.13) #6214

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(settings): parse PROTECTED_AUTOCLOSE_AUTHORS_EXTRA via the shared login-list parser (#audit-3.13) #6214

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
14 changes: 7 additions & 7 deletions src/settings/agent-actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { changedPathsHittingGuardrail, isGuardrailHit } from "../signals/change-
import { AGENT_LABEL_PENDING_CLOSURE } from "../review/linked-issue-hard-rules";
import { REVIEW_THREAD_BLOCKER_CODE } from "../review/review-thread-findings";
import { sanitizePublicComment } from "../github/commands";
import { parseGitHubLoginList } from "../auth/security";

// High-slop threshold default when a repo hasn't set slopGateMinScore (mirrors the gate's `high` band).
const DEFAULT_SLOP_GATE_MIN_SCORE = 60;
Expand Down Expand Up @@ -72,14 +73,13 @@ export function resolveNullableLabel(configured: string | null | undefined, fall
const PROTECTED_AUTOCLOSE_AUTHORS = new Set(["github-actions[bot]", "dependabot[bot]", "renovate[bot]"]);

// A self-hoster running a different automation stack (mergify[bot], snyk-bot, allcontributors[bot], ...) can
// extend the base allowlist with a comma-separated PROTECTED_AUTOCLOSE_AUTHORS_EXTRA env var instead of
// forking the code (#4615). Additive only -- an unset/blank value never shrinks the base set below.
// extend the base allowlist with a whitespace- or comma-separated PROTECTED_AUTOCLOSE_AUTHORS_EXTRA env var
// instead of forking the code (#4615). Parsed through the shared parseGitHubLoginList so it splits on the same
// `/[\s,]+/` convention every other GitHub-login-list env var uses (ADMIN_GITHUB_LOGINS, ...), not a narrower
// comma-only split (#audit-3.13). Additive only -- an unset/blank value never shrinks the base set below.
function protectedAutocloseAuthors(env: Env | undefined): Set<string> {
const extra = env?.PROTECTED_AUTOCLOSE_AUTHORS_EXTRA
?.split(",")
.map((login) => login.trim().toLowerCase())
.filter(Boolean);
return extra && extra.length > 0 ? new Set([...PROTECTED_AUTOCLOSE_AUTHORS, ...extra]) : PROTECTED_AUTOCLOSE_AUTHORS;
const extra = parseGitHubLoginList(env?.PROTECTED_AUTOCLOSE_AUTHORS_EXTRA);
return extra.size > 0 ? new Set([...PROTECTED_AUTOCLOSE_AUTHORS, ...extra]) : PROTECTED_AUTOCLOSE_AUTHORS;
}

export function isProtectedAutomationAuthor(login: string | null | undefined, env?: Env): boolean {
Expand Down
13 changes: 13 additions & 0 deletions test/unit/agent-actions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1491,6 +1491,19 @@ describe("isProtectedAutomationAuthor", () => {
expect(isProtectedAutomationAuthor("some-other-bot[bot]", env)).toBe(false);
});

it("parses PROTECTED_AUTOCLOSE_AUTHORS_EXTRA on mixed whitespace/newline/comma separators via the shared login-list parser (#audit-3.13)", () => {
// Mirrors ADMIN_GITHUB_LOGINS's whitespace-OR-comma convention: before #audit-3.13 the bare `.split(",")`
// here would fold "snyk-bot\nallcontributors[bot] copybara[bot]" into ONE unmatched string; parseGitHubLoginList
// splits each into its own login.
const env = createTestEnv({ PROTECTED_AUTOCLOSE_AUTHORS_EXTRA: "mergify[bot], snyk-bot\nallcontributors[bot] copybara[bot]" });
expect(isProtectedAutomationAuthor("mergify[bot]", env)).toBe(true);
expect(isProtectedAutomationAuthor("snyk-bot", env)).toBe(true);
expect(isProtectedAutomationAuthor("allcontributors[bot]", env)).toBe(true);
expect(isProtectedAutomationAuthor("copybara[bot]", env)).toBe(true);
expect(isProtectedAutomationAuthor("github-actions[bot]", env)).toBe(true); // base set still honored
expect(isProtectedAutomationAuthor("unlisted-bot[bot]", env)).toBe(false);
});

it("ignores a blank/whitespace-only PROTECTED_AUTOCLOSE_AUTHORS_EXTRA (never shrinks the base set)", () => {
const blank = createTestEnv({ PROTECTED_AUTOCLOSE_AUTHORS_EXTRA: " , ," });
expect(isProtectedAutomationAuthor("github-actions[bot]", blank)).toBe(true);
Expand Down