Skip to content

fix(control-panel): revoke owner-match scope for suspended installations (#953) #966

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
2 commits merged into from
Jun 21, 2026
Merged

fix(control-panel): revoke owner-match scope for suspended installations (#953) #966

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
952a5ce
fix(control-panel): revoke owner-match scope for suspended installati…
jason020818 Jun 21, 2026
dd785cf
Merge branch 'main' into fix/953-suspended-installation-control-panel…
Jun 21, 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/services/control-panel-roles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,16 @@ export function buildControlPanelAccessScope(args: RoleSummaryInputs): ControlPa
const installedRepos = args.repositories.filter((repo) => repo.isInstalled);
const accountInstallations = args.installations.filter((installation) => !installation.suspendedAt && sameLogin(installation.accountLogin, args.login));
const accountInstallationIds = new Set(accountInstallations.map((installation) => installation.id));
const ownedInstalledRepos = installedRepos.filter((repo) => sameLogin(repo.owner, args.login) || (repo.installationId !== undefined && repo.installationId !== null && accountInstallationIds.has(repo.installationId)));
// A suspended installation revokes the App's access, so a repo under a suspended account installation must not grant
// control-panel scope — including via the owner-match branch, which previously ignored suspendedAt (#953).
const suspendedAccountInstallationIds = new Set(
args.installations.filter((installation) => installation.suspendedAt && sameLogin(installation.accountLogin, args.login)).map((installation) => installation.id),
);
const ownedInstalledRepos = installedRepos.filter(
(repo) =>
!(repo.installationId !== undefined && repo.installationId !== null && suspendedAccountInstallationIds.has(repo.installationId)) &&
(sameLogin(repo.owner, args.login) || (repo.installationId !== undefined && repo.installationId !== null && accountInstallationIds.has(repo.installationId))),
);
const maintainerRepos = uniqueRepoNames(
args.pullRequests
.filter((pull) => sameLogin(pull.authorLogin, args.login) && isMaintainerAssociation(pull.authorAssociation))
Expand All @@ -101,7 +110,16 @@ export function buildControlPanelRoleSummary(args: RoleSummaryInputs): ControlPa
const installedRepos = args.repositories.filter((repo) => repo.isInstalled);
const accountInstallations = args.installations.filter((installation) => !installation.suspendedAt && sameLogin(installation.accountLogin, args.login));
const accountInstallationIds = new Set(accountInstallations.map((installation) => installation.id));
const ownedInstalledRepos = installedRepos.filter((repo) => sameLogin(repo.owner, args.login) || (repo.installationId !== undefined && repo.installationId !== null && accountInstallationIds.has(repo.installationId)));
// A suspended installation revokes the App's access, so a repo under a suspended account installation must not grant
// control-panel scope — including via the owner-match branch, which previously ignored suspendedAt (#953).
const suspendedAccountInstallationIds = new Set(
args.installations.filter((installation) => installation.suspendedAt && sameLogin(installation.accountLogin, args.login)).map((installation) => installation.id),
);
const ownedInstalledRepos = installedRepos.filter(
(repo) =>
!(repo.installationId !== undefined && repo.installationId !== null && suspendedAccountInstallationIds.has(repo.installationId)) &&
(sameLogin(repo.owner, args.login) || (repo.installationId !== undefined && repo.installationId !== null && accountInstallationIds.has(repo.installationId))),
);
const maintainerRepos = uniqueRepos(
args.pullRequests
.filter((pull) => sameLogin(pull.authorLogin, args.login) && isMaintainerAssociation(pull.authorAssociation))
Expand Down
29 changes: 29 additions & 0 deletions test/unit/control-panel-roles.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,35 @@ describe("control panel role summaries", () => {
});
});

it("revokes owner-match control-panel scope for a repo under a suspended account installation (#953)", () => {
const scope = buildControlPanelAccessScope({
login: "repo-owner",
generatedAt: "2026-06-01T12:00:00.000Z",
confirmedMiner: false,
operator: false,
repositories: [repo("repo-owner/owned-repo", "repo-owner", 21)],
installations: [{ ...installation(21, "repo-owner"), suspendedAt: "2026-06-10T00:00:00.000Z" }],
pullRequests: [],
});

expect(scope).toMatchObject({ operator: false, repositoryFullNames: [], installationIds: [], accountLogins: [] });
});

it("drops owner and maintainer roles when the owner's installation is suspended (#953)", () => {
const summary = buildControlPanelRoleSummary({
login: "repo-owner",
generatedAt: "2026-06-01T12:00:00.000Z",
confirmedMiner: false,
operator: false,
repositories: [repo("repo-owner/owned-repo", "repo-owner", 21)],
installations: [{ ...installation(21, "repo-owner"), suspendedAt: "2026-06-10T00:00:00.000Z" }],
pullRequests: [],
});

expect(summary.roles).toEqual([]);
expect(summary.evidence).toMatchObject({ ownedInstalledRepos: 0, accountInstallations: 0 });
});

it("includes installed maintainer repositories from cached PR evidence", () => {
const scope = buildControlPanelAccessScope({
login: "maintainer",
Expand Down
Loading