Skip to content

[reviewer] Review backlog (security): Skewed-head hold in hive-merge never clears when a merge request omits expect_sha #16152

Closed

Description

@hivecommons-hive

Blocked on PR #16146. This finding came from reviewing PR #16146 and is about code that PR is changing. Fix it in the PR, or leave it: when the PR merges the hive checks whether the finding is still on the base branch — closing this item as completed if its file or symbol is gone, lifting the block otherwise — and unblocks this item for re-triage if the PR is closed without merging. Once it is unblocked, check the finding still applies on the base branch; if it is already fixed, close this item without a PR.

Filed from an out-of-scope finding in the Hive review of PR #16146.

PR: #16146 (#16146)
Perspective: security
Severity: low (P3)
Finding: Skewed-head hold in hive-merge never clears when a merge request omits expect_sha
Evidence: src/pkg/github/merge_request_watcher.go:465

verdict, why, err := c.verifyMergeRequestCI(ctx, req.Repo, req.Number, req.ExpectSHA, now, prState.PendingSince)

The hive-merge CI gate now measures the skew hold from prState.PendingSince (merge_request_watcher.go:465 -> commit_ci.go HeadFirstSeenAt). That state is only persisted when req.ExpectSHA is non-empty (merge_request_state.go:113-117 putMergeRequestState returns early on empty SHA; mergeRequestState:98-101 returns no state for empty sha), and ExpectSHA is omitempty (merge_request_watcher.go:59). For a request without expect_sha during GitHub clock skew, HeadFirstSeenAt is zero on every poll, so commit_ci.go sets age=0 and blocks with 'head first seen 0s ago' until the skew itself ends. This is fail-closed (liveness, not a bypass) and matches pre-PR behavior for that path; the automerge sweep path is unaffected because its tracker key always includes the SHA. Consider having verifyMergeRequestCI fall back to its own per-(repo,number,head) first-seen record when expectSHA is empty.

Fingerprint: 69fe6a7cf2c4f85b66adde168fb4b9f7f436878537a581ecb575a7e9a28702aa

filed by Hive review backlog

Activity

  1. added
    blockedWaiting on something outside this repository; not contributor work until a human clears the label
    on Nov 1, 2026
  2. added
    help wantedDenotes an issue that needs help from a contributor. Must meet "help wanted" guidelines.
    on Nov 1, 2026
  3. removed
    help wantedDenotes an issue that needs help from a contributor. Must meet "help wanted" guidelines.
    blockedWaiting on something outside this repository; not contributor work until a human clears the label
    on Nov 1, 2026
  4. hivecommons-hive commented on Nov 1, 2026

    @hivecommons-hive
    ContributorAuthor

    Hive status — updated in place; edits do not notify. Full history is in the Activity Monitor.

    Unblocked: #16146 is no longer open. This issue is actionable again.

  5. added
    help wantedDenotes an issue that needs help from a contributor. Must meet "help wanted" guidelines.
    on Nov 1, 2026
  6. hivecommons-hive commented on Nov 1, 2026

    @hivecommons-hive
    ContributorAuthor

    Unblocked: #16146 merged and the finding's file is still on the base branch. This item is actionable now; check the finding still applies first, and close it without a PR if it is already fixed.

  7. hivecommons-hive commented on Nov 1, 2026

    @hivecommons-hive
    ContributorAuthor

    🔒 Claimed by agent scanner (agent on hive hosted-available-oke-11-placeholder-r05x). The claim lasts 2h0m0s without activity and renews while the work continues. Reply /unclaim to release, or /claim to take it over if you outrank the holder.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    agent/reviewerFiled by the reviewer agenthelp wantedDenotes an issue that needs help from a contributor. Must meet "help wanted" guidelines.

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions