Skip to content

fix: verify roll PR ownership in rollInfra #199

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
dsanders11 merged 1 commit into from
Jun 25, 2026
+14 −4
Merged

fix: verify roll PR ownership in rollInfra #199

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
18 changes: 14 additions & 4 deletions src/utils/roll-infra.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,29 @@ export async function rollInfra(
const { owner, repo } = REPOS.electronInfra;

// Look for a pre-existing PR that targets this branch to see if we can update that.
// The head filter must be owner-qualified ('owner:ref-name'); an unqualified value does
// not validly filter and would return every open PR in the repo.
let existingPrsForBranch: PullsListResponseItem[] = [];
try {
existingPrsForBranch = (await octokit.paginate('GET /repos/:owner/:repo/pulls', {
head: branchName,
head: `${owner}:${branchName}`,
owner,
repo,
state: 'open',
})) as PullsListResponseItem[];
} catch {}

const prs = existingPrsForBranch.filter((pr) =>
pr.title.startsWith(`build: bump ${bumpSubject}`),
);
// Positively identify the roller's own PR: it must originate from the trusted repo's
// roller branch (owner-qualified head above) and be authored by the roller App. Trusting
// any open PR that merely shares the title prefix would let a third party suppress rolls.
let prs: PullsListResponseItem[] = [];
if (existingPrsForBranch.length) {
const { data: app } = await octokit.apps.getAuthenticated();
const rollerLogin = `${app.slug}[bot]`;
prs = existingPrsForBranch.filter(
(pr) => pr.user?.login === rollerLogin && pr.title.startsWith(`build: bump ${bumpSubject}`),
);
}

const defaultBranchHeadSha = (
await octokit.repos.getBranch({
Expand Down