Sign in

Search issue titles and bodies, change requests and comments. Private repositories you cannot read are not included.

vole
Clone

Read only, no credentials:

https://rodent.software/vole.git

Write over SSH with a registered key:

git clone ssh://git@rodent.software:2222/vole.git

A free and open-source forge that lives in your Git repo.

Make access edits and approvals survive a concurrent change

62b59a76f9064a58a45d0997f6889d2a7f6265e7 · Keenan Nemetz · 13d ago · parent 78cd3437

Make access edits and approvals survive a concurrent change

Access rules were one row, and every editor read it, changed a field, and
wrote the whole document back with no version check. Two people on the
page at once silently overwrote each other, and the specific case that
mattered was worse than a lost edit: a repository admin's stale settings
save could restore a role an instance admin had just revoked.

The row now carries a revision, and a rule set read through the store
carries the revision it was read at. Writing it back is a
compare-and-swap: if the row moved, the write is refused with ErrConflict
instead of undoing the other change. A rule set built from scratch is a
create and refuses if a row appeared meanwhile, so no stale document can
replace a live one. Existing instances get the column added on open.

On top of that, the operations that own one field apply it to the row as
it is now (Store.Update, retried against a moving row):

  - the repository Settings page writes only the visibility. It no longer
    rewrites entries, runners or the approval policy, so an instance
    admin's revocation survives a page that was loaded before it.
  - adding one account writes that one entry.
  - the access form changes only the rows it rendered; an entry or a
    runners-list membership added while the page was open is kept.

Approvals and runners are also bound to current standing. An approval
counts only while its author is an active account that still holds
maintain or admin on the repository, filtered in FindApprovedMatch and
counted the same way on the request page, so the page cannot promise a
merge the gate then refuses. ACL.CanReport refuses a retired account even
while its name is in the runners list; the row outlives the account, so
membership alone would let a revoked account keep vouching for builds and
leasing jobs. The roster's Active predicate is attached by the store, the
same way the instance role already was, in both the server and the hook
process.

Tests: a stale whole-document write is refused and cannot restore a
revoked role; concurrent field-scoped updates all land; Update reports
the row as it is now; a retired account stops counting as an approver and
as a runner; a demoted maintainer's approval no longer lands a change; a
settings save leaves entries, runners, approval policy and protection
alone; a retired runner's record push is refused.

metadata/requests.go +16−1

@@ -461,6 +461,17 @@ type ApprovalRequirement struct {
461 461 OldTip string
462 462 // Required is the number of distinct approvals the ACL demands.
463 463 Required int
464 // Eligible, when set, filters approvals to the principals whose statement
465 // still counts — an active account that currently holds maintain or admin on
466 // the repository. Nil means every approval counts, which is only right for a
467 // caller with no roster to consult.
468 Eligible func(principal string) bool
469 }
470
471 // counts reports whether an approval from this principal is one the requirement
472 // accepts.
473 func (r ApprovalRequirement) counts(principal string) bool {
474 return r.Eligible == nil || r.Eligible(principal)
464 475 }
465 476
466 477 // Merge describes an approved outcome: the request that authorised the push and
@@ -509,9 +520,13 @@ func FindApprovedMatch(g *git.Repo, list []*Request, req ApprovalRequirement) (*
509 520 if !matches {
510 521 continue
511 522 }
523 // An approval is counted only while the person who wrote it still holds
524 // the standing to give it. Retirement and demotion both have to reach
525 // here: the file stays on the branch, so counting the file alone would let
526 // a revoked maintainer keep landing changes.
512 527 var approvers []string
513 528 for _, a := range r.Approvals {
514 if a.Head == r.Head && a.Base == r.Base {
529 if a.Head == r.Head && a.Base == r.Base && req.counts(a.Principal) {
515 530 approvers = append(approvers, a.Principal)
516 531 }
517 532 }