Skip to content

Queue cache: check stored objects before merge-tree; #453 lens follow-ups #457

Closed

Description

@scuttletoby

Follow-ups from the two lens reviews of #453 (both SAFE): state #453 (comment), trust #453 (comment). Merge-queue trust: treat as critical.

  1. major (trust, pre-existing): the queue cache trusts its stored objects without checking them. A replaced tree object in the cache can turn a real conflict into a clean merge. Fix: check the base, read and head commits (e.g. git fsck of those objects, or verify their tree hashes) before merge-tree, or use a fresh repo per run if that is cheap enough. Test: plant a replaced tree object; the run must refuse.
  2. minor (state): the own_cache HEAD write in pr_queue.py (around line 592) has no test. Cover a cache whose HEAD points at another default branch name (git 3.0 changes the default).
  3. git 3.0: the cache's fixed config sets ref and hash formats; check it still works (or refuses clearly) when git 3.0 defaults change (reftable, sha256).
  4. nits:
    • O_NOFOLLOW open in pr_queue.py (around line 542) has no test.
    • head_check.py (around line 390) turns an empty --remote into origin; refuse instead.
    • head_check.py (around line 524): the gate's merge-tree call keeps GIT_TRACE* vars; drop them as on the fetches.
    • RELEASE-NOTES "exit 2" wording does not hold for the gate; fix the text or the code.
    • A plain http:// remote keeps trace vars and may hand the token over after a redirect; refuse non-https remotes for token-carrying fetches.

State question for the fix: a cache from before the fix, a run stopped half-way, an empty fresh cache, re-run.

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions