Skip to content

πŸ› fix: reject auto-merge queues from untrusted merger identities - #14977

Closed
hivecommons-hive[bot] wants to merge 2 commits into
v6from
hive/adopt-14947
Closed

hivecommons-hive[bot] wants to merge 2 commits into
v6from
hive/adopt-14947

Conversation

@hivecommons-hive

Copy link
Copy Markdown
Contributor

Supersedes #14947 (adopted after CI went red and the contributor was unavailable; original commits by @thatguywob preserved).

Fixes #14938

This branch is #14947's head bc3a6ea3ac36 as pushed by @thatguywob (fork thatguywob/hive), unchanged. Last lane reason on the original: contributor-lane:decision-requested.

Hive fix agent: rebase this branch on v6, fix the failing checks / review asks, and push to THIS branch. Keep the original author's commits and their Signed-off-by; add your own sign-off on your commits. Do not open another PR.

thatguywob and others added 2 commits October 28, 2026 13:52
Check the recorded queue actor against dashboard.authorized_users before
posting an approval. Explain merge-time refusals once per PR head, including
authorization revocation at the serialized lane's final re-check.

Hive-Run: #14938
Hive-Plan: queue-merge-authorization-parity
Hive-Spec: issue-14938#acceptance-criteria
Co-authored-by: Danathar <6772335+Danathar@users.noreply.github.com>
Signed-off-by: thatguywob <thatguywob@users.noreply.github.com>
The hive and contributor image jobs failed downloading pinned base image layers from mirror.gcr.io with HTTP 429. Retry CI on a fresh head; the source and test checks passed.

Signed-off-by: thatguywob <thatguywob@users.noreply.github.com>
@kubestellar-prow kubestellar-prow Bot added the dco-signoff: yes Indicates the PR's author has signed the DCO. label Oct 28, 2026
@kubestellar-prow

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign hanthor for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kubestellar-prow kubestellar-prow Bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Oct 28, 2026
@hivecommons-hive hivecommons-hive Bot added author/hive This repository's own hive (the App or one of its agent lanes) authored this PR dco All commits are DCO signed-off role/trusted Author is trusted for unattended merge (trusted-author role or registry/claim tier in require_tiers) stage/050-review-pending Review swarm requested; awaiting a verdict for the current head labels Oct 28, 2026
@github-actions

Copy link
Copy Markdown
Contributor

Open PR overlap check

Base branch: v6

Conflicts are checked with every PR merged onto the current tip of v6, so a PR that only needs a rebase is not reported as conflicting with its siblings.

PR Title Relation Files
#14947 πŸ› fix: reject auto-merge queues from untrusted merger identities same files changelog.d/fixed-14938-trusted-queue.md
src/pkg/dashboard/api.go
src/pkg/dashboard/api_v1_pr_automerge_test.go
src/pkg/dashboard/pr_automerge_test.go
src/pkg/github/automerge/automerge_sweep.go
src/pkg/github/automerge/automerge_sweep_test.go
src/pkg/github/automerge/automerge_sweep_trusted_merger_test.go
src/pkg/github/automerge/automerge_untrusted_merger.go
#14945 πŸ› fix: release label-blocked serialized lane fronts during sweeps same files src/pkg/github/automerge/automerge_sweep.go
src/pkg/github/automerge/automerge_sweep_test.go

@hivecommons-hive

Copy link
Copy Markdown
Contributor Author

Superseded by #14947 (earlier fix for #14938). Closing as duplicate.

@hivecommons-hive hivecommons-hive Bot added the hive/superseded Closed by Hive: a different merged PR already landed this change label Oct 28, 2026
@hivecommons-hive hivecommons-hive Bot closed this Oct 28, 2026
hivecommons-hive Bot pushed a commit that referenced this pull request Oct 28, 2026
…als out of the merge gate (#15011)

* Close superseded hive PRs automatically and re-stage adopted originals out of the merge gate

A hive-authored PR whose closing targets are all closed, one of them by a
different merged PR, and whose head conflicts with the base (or whose files
that PR already covers) is now closed by the hive itself as hive/superseded
with a notice naming the superseding PR: in the self-authored auto-merge
lane before any review is dispatched, in the supersession sweep when the
rebase is refused for a conflict, and in close-on-merge of the superseding
PR. New knob governor.auto_close_superseded (default on); human-authored PRs
are never auto-closed.

A contributor PR adopted in supersede mode leaves stage/085-needs-decision
in the adopting pass when the park was only the review swarm's
requires_human verdict, renders in the CI/Review column with an
'Adopted -> #N' pill, and the duplicate-fix sweep no longer closes the
superseding App PR as a duplicate of the PR it supersedes.

Evidence: #14965 (closed by #14957 for #14952), #14975 -> #14980,
Signed-off-by: Andrew Anderson <andy@clubanderson.com>
#14947 -> #14977.

* Move changelog fragment to repo-root changelog.d

Signed-off-by: Andrew Anderson <andy@clubanderson.com>

---------

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
clubanderson added a commit that referenced this pull request Oct 29, 2026
…dopted or could-not-adopt, routes workflow-path PRs to the workflows capability blocker, and re-adoption survives the mutation journal

Let hive decide β†’ adopt-supersede settled the operator-action ledger as
applied ("done") as soon as the adoption/supersede request label landed,
and the βœ“ hover kept saying so while nothing happened.

- #14822 edits .github/workflows: the adoption engine's
  fence refused the supersession (adoption-stalled:contributor-lane:
  workflow-path) and the row fell back to a bare Needs human decision.
  The policy now decides such PRs as capability-gap (recommend-only),
  the ledger records blocked, and the badge names the
  capability:workflows-permission blocker with what a person can do.
- #14947 was adopted (copy #14977), the copy was closed by
  the duplicate sweep, and the re-adoption's branch_push /
  pull_request_create claims had the same inputs as the first attempt, so
  the mutation journal replayed them as idempotent success without running
  the effect: created == nil β†’ "error=None" β†’ adoption reverted. The
  claims now carry prior_copy, and a replayed provenance URL is resolved
  and reused while the copy is still open.
- settledDelegatedOutcome: adopt-supersede β†’ executing, dedup β†’ no-effect,
  capability-gap β†’ blocked. The tracker derives the βœ“ state from the
  stage record (adopted as #N / could not adopt / still executing / stuck)
  and exposes progress, blocker and human to the SPA hover.

Fixes #15188

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
clubanderson added a commit that referenced this pull request Oct 29, 2026
…dopted or could-not-adopt, routes workflow-path PRs to the workflows capability blocker

Let hive decide β†’ adopt-supersede settled the operator-action ledger as
applied ("done") as soon as the adoption/supersede request label landed,
and the βœ“ hover kept saying so while nothing happened.

- #14822 edits .github/workflows: the adoption engine's
  fence refused the supersession (adoption-stalled:contributor-lane:
  workflow-path) and the row fell back to a bare Needs human decision.
  The policy now decides such PRs as capability-gap (recommend-only),
  the ledger records blocked, and the badge names the
  capability:workflows-permission blocker with what a person can do.
- #14947: the re-adoption after the copy #14977 was
  closed was replayed by the mutation journal; that fix landed in
  #15209 (prior_copy claim input, replayed provenance
  resolved). This PR layers the ledger / hover states over it.
- settledDelegatedOutcome: adopt-supersede β†’ executing, dedup β†’ no-effect,
  capability-gap β†’ blocked. The tracker derives the βœ“ state from the
  stage record (adopted as #N / could not adopt / still executing / stuck)
  and exposes progress, blocker and human to the SPA hover.

Fixes #15188

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
clubanderson added a commit that referenced this pull request Oct 29, 2026
…dopted or could-not-adopt, routes workflow-path PRs to the workflows capability blocker

Let hive decide β†’ adopt-supersede settled the operator-action ledger as
applied ("done") as soon as the adoption/supersede request label landed,
and the βœ“ hover kept saying so while nothing happened.

- #14822 edits .github/workflows: the adoption engine's
  fence refused the supersession (adoption-stalled:contributor-lane:
  workflow-path) and the row fell back to a bare Needs human decision.
  The policy now decides such PRs as capability-gap (recommend-only),
  the ledger records blocked, and the badge names the
  capability:workflows-permission blocker with what a person can do.
- #14947: the re-adoption after the copy #14977 was
  closed was replayed by the mutation journal; that fix landed in
  #15209 (prior_copy claim input, replayed provenance
  resolved). This PR layers the ledger / hover states over it.
- settledDelegatedOutcome: adopt-supersede β†’ executing, dedup β†’ no-effect,
  capability-gap β†’ blocked. The tracker derives the βœ“ state from the
  stage record (adopted as #N / could not adopt / still executing / stuck)
  and exposes progress, blocker and human to the SPA hover.

Fixes #15188

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
clubanderson added a commit that referenced this pull request Oct 29, 2026
…dopted or could-not-adopt, routes workflow-path PRs to the workflows capability blocker (#15206)

Let hive decide β†’ adopt-supersede settled the operator-action ledger as
applied ("done") as soon as the adoption/supersede request label landed,
and the βœ“ hover kept saying so while nothing happened.

- #14822 edits .github/workflows: the adoption engine's
  fence refused the supersession (adoption-stalled:contributor-lane:
  workflow-path) and the row fell back to a bare Needs human decision.
  The policy now decides such PRs as capability-gap (recommend-only),
  the ledger records blocked, and the badge names the
  capability:workflows-permission blocker with what a person can do.
- #14947: the re-adoption after the copy #14977 was
  closed was replayed by the mutation journal; that fix landed in
  #15209 (prior_copy claim input, replayed provenance
  resolved). This PR layers the ledger / hover states over it.
- settledDelegatedOutcome: adopt-supersede β†’ executing, dedup β†’ no-effect,
  capability-gap β†’ blocked. The tracker derives the βœ“ state from the
  stage record (adopted as #N / could not adopt / still executing / stuck)
  and exposes progress, blocker and human to the SPA hover.

Fixes #15188

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

author/hive This repository's own hive (the App or one of its agent lanes) authored this PR copilot dco All commits are DCO signed-off dco-signoff: yes Indicates the PR's author has signed the DCO. hive/superseded Closed by Hive: a different merged PR already landed this change role/trusted Author is trusted for unattended merge (trusted-author role or registry/claim tier in require_tiers) size/L Denotes a PR that changes 100-499 lines, ignoring generated files. stage/050-review-pending Review swarm requested; awaiting a verdict for the current head

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant