Skip to content

fix: backport author association policy and align checks #854

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

Open
joshtrichards wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: backport author association policy and align checks #854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc8c5e4
fix: add helper to align backport author association checks
joshtrichards Jul 26, 2026
a82df67
fix: align live comment backport authorization checks
joshtrichards Jul 26, 2026
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
22 changes: 20 additions & 2 deletions src/githubUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,24 @@ import { getApp } from './appUtils'
import { AuthResponse, COMMAND_PREFIX, PRChanges, Task } from './constants'
import { IssueComment, Milestone } from '@octokit/webhooks-types'

// Users allowed to request backports through PR comments.
//
// CONTRIBUTOR is intentionally included for users who have previously
// contributed commits to the repository, even if they do not currently
// have repository write access. Backport PRs still go thru normal
// approval/merge process once created.
const BACKPORT_REQUEST_ASSOCIATIONS = new Set([
'OWNER',
'MEMBER',
'COLLABORATOR',
'CONTRIBUTOR',
])

export const isAllowedBackportAuthorAssociation = (authorAssociation?: string): boolean => {
return authorAssociation !== undefined &&
BACKPORT_REQUEST_ASSOCIATIONS.has(authorAssociation)
}

export enum Reaction {
THUMBS_UP = '+1',
THUMBS_DOWN = '-1',
Expand Down Expand Up @@ -218,8 +236,8 @@ export const getBackportRequestsFromPR = async (octokit: Octokit, task: Task): P
.filter(comment => comment?.body?.trim().startsWith(COMMAND_PREFIX))
// Filter out forced requests
.filter(comment => !comment?.body?.trim().startsWith(COMMAND_PREFIX + '!'))
// Filter out comments from non-collaborators
.filter(comment => comment?.author_association !== 'NONE')
// Filter out comments from users not authorized to request backports
.filter(comment => isAllowedBackportAuthorAssociation(comment?.author_association))
// Filter out comments that got rejected by the bot.
// This is a safety measure, we will check the command again
.filter(comment => comment.reactions?.confused === 0) as IssueComment[]
Expand Down
8 changes: 4 additions & 4 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { addToQueue } from './queue.js'
import { ALLOWED_ORGS, CACHE_DIRNAME, COMMAND_PREFIX, LABEL_BACKPORT, PRIVATE_KEY_PATH, ROOT_DIR, SERVE_HOST, SERVE_PORT, TO_SEPARATOR, Task, WEBHOOK_SECRET, WORK_DIRNAME } from './constants.js'
import { extractBranchFromPayload, extractCommitsFromPayload, isFriendly } from './payloadUtils.js'
import { getApp } from './appUtils.js'
import { Reaction, addPRLabel, addReaction, getAuthToken, getBackportRequestsFromPR, getCommitsForPR, removePRLabel } from './githubUtils.js'
import { Reaction, addPRLabel, addReaction, getAuthToken, getBackportRequestsFromPR, getCommitsForPR, isAllowedBackportAuthorAssociation, removePRLabel } from './githubUtils.js'
import { setGlobalGitConfig } from './gitUtils.js'

const app = getApp()
Expand Down Expand Up @@ -152,11 +152,11 @@ app.webhooks.on(['issue_comment.created'], async ({ payload }) => {

// Check if the comment is a backport request
if (body.trim().startsWith(COMMAND_PREFIX)) {
// Check if the author is at least a collaborator
// Check if the author is allowed to request a backport
const commentAuthor = payload?.comment?.user.login
const authorAssociation = payload?.comment?.author_association
if (!authorAssociation || authorAssociation === 'NONE') {
info(`Ignoring comment from non-collaborator: ${commentAuthor}`)
if (!isAllowedBackportAuthorAssociation(authorAssociation)) {
info(`Ignoring backport request from unauthorized user: ${commentAuthor}`)
return
}

Expand Down
Loading