mirror of
https://github.com/block/buzz.git
synced 2026-11-14 13:21:02 +00:00
## Summary This PR is stacked on #9064. It does two things to the Git-on-object-storage code in `buzz-relay`. It replaces the TLA+ model of the push protocol with one that states what the protocol is supposed to implement and checks that it does. It also changes the rule by which the relay decides whether to publish a push, because the new model shows that the rule #9064 introduces still publishes requests in which git accepted nothing. ### Relationship to #9064 The branch is `main`, then the two commits of #9064, then four commits of this PR: the specification work, the publish-rule change, a review fix merged from #9429, and a fix to `check.sh`. A merge of `main` follows them; it was needed because `main` changed `Justfile`, which #9429 also edits, after the branch point. The first two commits are #9064's, replayed onto current `main` without conflicts and otherwise unchanged. The base of this PR stays `main` because #9064's branch is about 200 commits behind it. Once #9064 merges, this branch can be rebased and the diff shrinks to the last four commits. Until then, review the commits after the first two. This PR keeps two of #9064's three changes as they are: the `published_at` stamp that orders kind:30618 events by the manifest chain, and `protect_landed`, which lets a landed conditional write stand when the serving lease lapses after it. It replaces the third, the publish rule. ### The publish rule #9064 publishes when git exits 0 and the status report has an `ok` line or no `ng` line. That handles a push in which one ref is updated and another refused. The report, however, is not evidence of what git did. - git exits 0 for a request that carries no commands, and for a push the pre-receive hook declined. A decline is reported only to a client that negotiated `report-status`. For a request with no commands, and for a decline when the client did not negotiate a report, there is no `ng` line. The relay then writes the pointer and emits a relay-signed kind:30618 event that names the caller as pusher, although the push policy approved nothing. - The report is read from a stream whose framing the client's capabilities determine, so the decision depends on parsing a client-shaped stream. The decision is now taken from the workspace. `push_disposition` compares the refs after receive-pack with the refs the workspace was hydrated from. Unchanged refs are answered with git's own output and nothing is published. Changed refs are published if git exited normally. Changed refs after an abnormal exit fail the request. The snapshot that is compared is the one `cas_publish` publishes, so git's per-ref report is true of the published state. The status-report scanner and its tests are removed, and the ref-name conflict case they covered moves into the table-driven test described below. Three smaller changes follow. The ref-snapshot parser now fails closed: output that was not UTF-8 used to read as an empty ref set and a malformed line was skipped, and either would publish a manifest that lacks refs. `manifest_changed` in `finalize_push` could not be false and is removed. Taking the snapshot before the publish decision moved its resource-limit error (snapshot larger than 4 MiB, or more refs than a manifest may hold) onto a path that answered 500; #9429 restores the 413 the publish path gave before and adds `snapshot_resource_limit_answers_413`. ### What the specification work adds - `docs/spec/GitRefDB.tla` is the specification: a ref database in which a push takes effect in one step, is applied only if authorized and only against the old values it names, and is reported truthfully. - `docs/spec/GitOnObjectStore.tla` is the protocol: several refs, an object graph with reachability, packs, compaction, the pre-receive hook, the publish decision, the default-branch setter, repository creation, and a reader. `git receive-pack` is represented by a stated contract rather than modeled internally. - The correctness statement is `Refines`: every behavior of the protocol is a behavior of the specification. TLC checks it together with the store invariants (fence, reader completeness, closure of published manifests). - `docs/spec/check.sh` pins TLC 1.7.4 by SHA-256 and runs 28 checks. Eight instances must pass. Nineteen seeded design errors must each be detected with the violation named for them. One coverage check confirms that a behavior the properties depend on (git reporting `ok` for a command that changes nothing) is reachable. A name passed to `check.sh` that is not a check is an error, so a misspelled selection cannot report success. - Both earlier publish rules are among the seeded errors: the original rule (exit 0 and no `ng`) and #9064's status-report rule. For each, TLC reports a publication the policy did not approve (`PublishIsAuthorizedChange`) and a violation of `Refines`. - `docs/spec/GitPushPath.qnt`, the Quint model from #9064 that covers the serving lease and the event timestamps, is extended. The publish rule becomes a parameter with three values, a request may carry no commands or come from a client without a status report, and a new invariant, `publicationChangesRefs`, states that a published manifest differs in its refs from the one it replaces. The implemented rule satisfies all four invariants; the status-report rule violates the new one with a zero-command request. - `docs/spec/lean/GitPointer.lean` is a Lean 4 proof, with no dependencies, of the pointer discipline for any number of clients, refs and objects: the fence, closure, that every pointer change is a legal step from the value it replaces, that the length of the pointer's predecessor chain equals the number of pointer writes, and that a successful conditional write implies no intervening write. - `.github/workflows/spec.yml` runs TLC and Lean when a file under `docs/spec/` changes. On this PR's first run the TLC job took 10 minutes 19 seconds and the Lean job 22 seconds. Quint is not run in CI. - `docs/git-on-object-storage.md` is revised to match. The push listing follows the implemented order. The verification section separates definitions, assumptions, results checked by TLC, results proved in Lean, results checked with Quint, evidence about the implementation, and limitations. The invariant names cited by code comments and by migration 0002 are kept as aliases in the TLA+ module. ### Assumptions and limitations The TLC results hold for the bounded instances in `check.sh`, not for arbitrary sizes. The Lean proof is unbounded but covers the pointer discipline only, not the refinement. The Quint results are from random simulation (2,000,000 runs of at most 14 steps) and a bounded symbolic check (8 steps, Apalache); neither is a proof for unbounded runs. All of them rest on the assumptions named in the document: the object store's conditional-write semantics, ETag equality implying body equality, no SHA-256 collision among the values that occur, the stated contract for `git receive-pack`, and the policy endpoint deciding authorization. The correspondence between the models and the Rust code is established by reading the code and by the tests below; it is not mechanized. The document states one assumption that #9064's ordering fix depends on and that no model covers (Assumption C1). A manifest whose parent carries no `published_at` (the empty manifest written when a repository is announced, or a manifest written before the field existed) is stamped with the writing instance's current time plus one second. Its event is selected over the parent's only if that value exceeds the parent event's `created_at`, which was taken from the clock of the instance that emitted it. This holds when one instance handles both, and otherwise when the writing instance's clock is not behind the other's by more than the time elapsed between the two events. The assumption concerns one write per repository. The document lists its removal as a proposed extension, for example by having the first push after an unstamped manifest read the stored event's `created_at` and exceed it. ### Related issue Related to #2621 (CI for the formal models). This adds the TLC job for the git model and a Lean job; it does not cover the Tamarin models or the NIP-PL scripts, so it should not close that issue. ### Testing Run locally on the restacked branch: - `docs/spec/check.sh`: 28 checks, each with the expected result (8 pass, 19 seeded errors violate the named property, 1 coverage witness reached). About three minutes on 16 cores; the largest instance has 6,773,286 distinct states. - `lake build` in `docs/spec/lean` (Lean 4.33.1): succeeds. The safety theorems depend only on `propext`, `Classical.choice` and `Quot.sound`. - Quint 0.33.0, `GitPushPath.qnt`: `quint run --main fixed --invariant safety --max-steps 14 --max-samples 2000000 --seed 0x1` reports no violation; `quint verify --main fixed --invariant safety --max-steps 8` (Apalache 0.62.1) reports no violation; each single-defect module produces the counterexample the document lists. - `cargo fmt --all -- --check` and `cargo clippy -p buzz-relay --all-targets -- -D warnings`: clean. - `cargo nextest run -p buzz-relay --lib -E 'test(/^api::/) + test(/side_effects/)'`: 158 passed. - The storage-backed `finalize_push` tests (`api:
:transport::track_c_tests::external_infra_minio_tests`, with `--run-ignored ignored-only`) against local Postgres and MinIO: 5 passed. - `e2e_git` against a local relay built from this branch, with Postgres, Redis and MinIO: 3 passed (clone/push/fetch/force-push round trip, concurrent push, partially refused push). The storage probe in that test needs `BUZZ_E2E_GIT_COMMUNITY_ID` set to the local community's id. - `just file-size-check` and `just security-review-check`: pass. Two regression tests bind the changed decision to production code, and both were confirmed to fail when the decision is forced back to the exit status: - `push_is_published_exactly_when_receive_pack_changed_refs` runs real git through the production `run_git_at` and `observe_push` for seven ways a push can end: a request with no commands, a push the hook declines with and without a status report, an accepted push, an accepted command that asks for the value the ref already has, a push in which one ref is updated and another refused for its old value, and a push that creates two refs whose names conflict, of which git creates one and refuses the other. It needs no services. Which of the two conflicting refs git creates depends on the git version (2.50 creates the first command's ref, 2.56 on the flake-check runner creates the other), so the test accepts either outcome and requires that each ref is in the published snapshot exactly when git reported `ok` for it. The first version of this case assumed one outcome and failed the Rust flake check for that reason. Before #9429, `just test-unit` selected neither `api:
:cas_publish::tests` nor `api:
:transport::track_c_tests`, so this test ran only in the flake check; both modules are now in the unit-test lane (45 tests, none needing services). It is Unix-only because its hook fixture sets file modes; the first push of this PR failed Windows clippy for that reason, and the test and its fixture are now gated with `#[cfg(unix)]`. That gating has not been compiled for Windows locally, so the Windows CI job is the check. - `finalize_push_publishes_nothing_when_receive_pack_changed_no_ref` calls `finalize_push` with an unchanged workspace and checks that the pointer is not written and no kind:30618 event is stored. It needs Postgres and an object store. Not done, or not covered: - No CI job selects the storage-backed `finalize_push` tests or `e2e_git`, so the second regression test and the end-to-end tests are evidence only when someone runs them. Adding them to CI needs a change to the test fixture, which applies migrations itself, and is left as a follow-up. - `just ci` was not run in full. - No human has tested the change. The human-testing step of the readiness checklist in `AGENTS.md` is not met, and `buzz-review-completed` is not claimed. The local secret-scanning hook (`sadscan`) was skipped for the commits and pushes that touch `crates/buzz-relay/src/api/git/settings_tests.rs`. It scans whole files and flags the P-256 test key fixtures that file already contains on `main`; this branch adds no key material. --------- Signed-off-by: Jordan Mecom <jm@squareup.com> Signed-off-by: Tom Brow <tomb@squareup.com> Co-authored-by: Tom Brow <tomb@squareup.com> Co-authored-by: studio <dc2fc481343672df31a689840c09299972e704dac592e0da6f18486646a7ee3e@localhost>
328 lines
13 KiB
Plaintext
328 lines
13 KiB
Plaintext
// Model of the parts of Buzz's Git-on-object-storage push path that the TLA+
|
|
// model (docs/spec/GitOnObjectStore.tla) leaves out: the serving-write lease
|
|
// around the pointer CAS and the timestamps of the kind:30618 events. It also
|
|
// states the publish decision over what clients are told, which complements
|
|
// the refinement statement of the TLA+ model.
|
|
//
|
|
// - info/refs and the receive-pack POST are separate requests; each hydrates
|
|
// from whatever pointer is current when it runs (transport.rs).
|
|
// - receive-pack applies each ref update independently (non-atomic push); a
|
|
// pre-receive hook decline rejects all refs. The per-ref outcome is written
|
|
// to the client only if it negotiated `report-status`, and a request may
|
|
// carry no commands at all.
|
|
// - finalize_push decides whether to publish (`push_disposition`), then CASes
|
|
// the manifest pointer inside a serving-write lease that can be lost around
|
|
// the CAS (buzz-deletion).
|
|
// - after the CAS, the relay emits a kind:30618 ref-state event; clients read
|
|
// the newest one, ties broken by lowest id
|
|
// (desktop/src/features/projects/hooks.ts, buzz-db ORDER BY created_at DESC,
|
|
// id ASC).
|
|
//
|
|
// Invariants are stated over what clients observe, not over protocol
|
|
// internals. PUBLISH_RULE selects the implemented publish decision or one of
|
|
// the two rules the relay used earlier, and each FIX_* constant switches one
|
|
// defect to its fix. `fixed` models the code as it is; `current` models the
|
|
// code before any of the fixes.
|
|
//
|
|
// Check with Quint (https://quint-lang.org):
|
|
// quint run docs/spec/GitPushPath.qnt --main fixed --invariant safety \
|
|
// --max-steps 14 --max-samples 2000000 --seed 0x1
|
|
// quint verify docs/spec/GitPushPath.qnt --main fixed --invariant safety \
|
|
// --max-steps 8
|
|
// The same commands with --main current, partialBugOnly, reportRuleOnly,
|
|
// leaseBugOnly, or timestampBugOnly report a counterexample.
|
|
//
|
|
// The initial manifest carries a stamp. The announce-time seed and manifests
|
|
// written before `published_at` existed carry none; the argument for them
|
|
// rests on an assumption about clocks that is stated in
|
|
// docs/git-on-object-storage.md and is not modeled here.
|
|
module buzzgit {
|
|
// "refs": publish when receive-pack changed the workspace refs (the
|
|
// implemented rule, `push_disposition`).
|
|
// "report": publish when the status report has an `ok` line or no `ng`
|
|
// line (the rule before it).
|
|
// "no_ng": publish when the status report has no `ng` line (the original
|
|
// rule).
|
|
const PUBLISH_RULE: str
|
|
const FIX_LEASE: bool
|
|
const FIX_TIMESTAMPS: bool
|
|
|
|
// ---- Domain ----------------------------------------------------------
|
|
|
|
type Refs = str -> int // ref name -> commit; 0 means absent
|
|
|
|
type Push = {
|
|
phase: str, // idle | advertised | received | committed | done
|
|
adv: Refs, // refs the client saw in info/refs
|
|
targets: Set[str], // refs this push updates (each to commit = pusher id)
|
|
base: int, // manifest version receive-pack hydrated from
|
|
ws: Refs, // workspace refs after receive-pack
|
|
report: str -> str, // what receive-pack did with each command: ok | ng
|
|
status: bool, // did the client negotiate report-status?
|
|
told: str -> str, // what the client printed: ok | ng | fail
|
|
stamp: int, // created_at of the 30618 this push emits
|
|
}
|
|
|
|
type Manifest = { refs: Refs, stamp: int }
|
|
type Event = { createdAt: int, id: int, refs: Refs }
|
|
|
|
pure val REF_LIST = ["main", "feature", "feature/x"]
|
|
pure val REFS = Set("main", "feature", "feature/x")
|
|
pure val PUSHERS = Set(1, 2)
|
|
pure val EVENT_IDS = 1.to(5)
|
|
pure val MAX_TIME = 2
|
|
|
|
pure val INITIAL_REFS: Refs = Map("main" -> 9, "feature" -> 9, "feature/x" -> 0)
|
|
|
|
pure val IDLE: Push = {
|
|
phase: "idle",
|
|
adv: INITIAL_REFS,
|
|
targets: Set(),
|
|
base: 0,
|
|
ws: INITIAL_REFS,
|
|
report: Map(),
|
|
status: true,
|
|
told: Map(),
|
|
stamp: 0,
|
|
}
|
|
|
|
// git refuses a ref whose name is a directory/file prefix of a live ref.
|
|
pure def dfConflict(ws: Refs, r: str): bool =
|
|
(r == "feature/x" and ws.get("feature") != 0) or
|
|
(r == "feature" and ws.get("feature/x") != 0)
|
|
|
|
// Non-atomic receive-pack: process commands in order; each applies only if
|
|
// the workspace still holds the client's old value and the name is free.
|
|
pure def receivePack(p: int, adv: Refs, targets: Set[str], ws0: Refs, hookDeny: bool)
|
|
: { ws: Refs, report: str -> str } = {
|
|
if (hookDeny)
|
|
{ ws: ws0, report: targets.mapBy(_ => "ng") }
|
|
else
|
|
REF_LIST.foldl({ ws: ws0, report: Map() }, (acc, r) =>
|
|
if (not(targets.contains(r))) acc
|
|
else if (acc.ws.get(r) == adv.get(r) and not(dfConflict(acc.ws, r)))
|
|
{ ws: acc.ws.set(r, p), report: acc.report.put(r, "ok") }
|
|
else
|
|
{ ws: acc.ws, report: acc.report.put(r, "ng") })
|
|
}
|
|
|
|
pure def anyOk(report: str -> str): bool = report.keys().exists(r => report.get(r) == "ok")
|
|
pure def anyNg(report: str -> str): bool = report.keys().exists(r => report.get(r) == "ng")
|
|
|
|
// The status report as the relay and the client see it: git writes the
|
|
// per-ref lines only for a client that negotiated report-status.
|
|
pure def visible(pr: Push): str -> str = if (pr.status) pr.report else Map()
|
|
|
|
// transport.rs. `hydrated` is the ref state the workspace was built from.
|
|
pure def shouldPublish(pr: Push, hydrated: Refs): bool =
|
|
if (PUBLISH_RULE == "refs") pr.ws != hydrated
|
|
else if (PUBLISH_RULE == "report") anyOk(visible(pr)) or not(anyNg(visible(pr)))
|
|
else not(anyNg(visible(pr)))
|
|
|
|
pure def max(a: int, b: int): int = if (a > b) a else b
|
|
|
|
// ---- State -------------------------------------------------------------
|
|
|
|
var ptr: int // current manifest version (the pointer)
|
|
var manifests: int -> Manifest // published manifests by version
|
|
var nextVersion: int
|
|
var events: Set[Event] // stored kind:30618 events
|
|
var now: int // wall clock (seconds)
|
|
var push: int -> Push
|
|
var landed: Set[(int, str)] // (pusher, ref) updates that reached the pointer
|
|
|
|
// ---- Actions -----------------------------------------------------------
|
|
|
|
action init = all {
|
|
ptr' = 0,
|
|
manifests' = Map(0 -> { refs: INITIAL_REFS, stamp: 0 }),
|
|
nextVersion' = 1,
|
|
events' = Set({ createdAt: 0, id: 0, refs: INITIAL_REFS }),
|
|
now' = 0,
|
|
push' = PUSHERS.mapBy(_ => IDLE),
|
|
landed' = Set(),
|
|
}
|
|
|
|
// GET info/refs: the client learns the current refs and picks updates.
|
|
action advertise(p: int): bool = all {
|
|
push.get(p).phase == "idle",
|
|
// A request may carry no commands.
|
|
nondet targets = REFS.powerset().filter(s => s.size() <= 2).oneOf()
|
|
push' = push.set(p, { ...push.get(p),
|
|
phase: "advertised",
|
|
adv: manifests.get(ptr).refs,
|
|
targets: targets,
|
|
}),
|
|
ptr' = ptr, manifests' = manifests, nextVersion' = nextVersion,
|
|
events' = events, now' = now, landed' = landed,
|
|
}
|
|
|
|
// POST git-receive-pack: hydrate from the *current* pointer, run hook and
|
|
// per-ref updates in the ephemeral workspace.
|
|
action receive(p: int): bool = all {
|
|
push.get(p).phase == "advertised",
|
|
nondet hookDeny = Set(true, false).oneOf()
|
|
nondet status = Set(true, false).oneOf()
|
|
val pr = push.get(p)
|
|
val result = receivePack(p, pr.adv, pr.targets, manifests.get(ptr).refs, hookDeny)
|
|
push' = push.set(p, { ...pr,
|
|
phase: "received",
|
|
base: ptr,
|
|
ws: result.ws,
|
|
report: result.report,
|
|
status: status,
|
|
}),
|
|
ptr' = ptr, manifests' = manifests, nextVersion' = nextVersion,
|
|
events' = events, now' = now, landed' = landed,
|
|
}
|
|
|
|
// finalize_push when it does not publish: either the rule found nothing to
|
|
// publish, or the CAS lost the race (409, the client sees an HTTP error for
|
|
// every ref).
|
|
action finalizeNoPublish(p: int): bool = all {
|
|
val pr = push.get(p)
|
|
val publish = shouldPublish(pr, manifests.get(pr.base).refs)
|
|
all {
|
|
pr.phase == "received",
|
|
not(publish) or ptr != pr.base,
|
|
// Skipped publish: git's report-status goes back verbatim.
|
|
// Lost CAS: 409, an HTTP error for every ref.
|
|
push' = push.set(p, { ...pr,
|
|
phase: "done",
|
|
told: if (publish) pr.targets.mapBy(_ => "fail") else visible(pr),
|
|
}),
|
|
},
|
|
ptr' = ptr, manifests' = manifests, nextVersion' = nextVersion,
|
|
events' = events, now' = now, landed' = landed,
|
|
}
|
|
|
|
// finalize_push CAS. The serving-write lease may be lost after the pointer
|
|
// PUT lands; `protect` then discards the result and returns 503.
|
|
action commit(p: int): bool = all {
|
|
val pr = push.get(p)
|
|
all {
|
|
pr.phase == "received",
|
|
shouldPublish(pr, manifests.get(pr.base).refs),
|
|
ptr == pr.base,
|
|
nondet leaseLostAfterCas = Set(true, false).oneOf()
|
|
nondet skew = Set(0, 1).oneOf() // per-instance clock offset
|
|
val okRefs = pr.report.keys().filter(r => pr.report.get(r) == "ok")
|
|
val parentStamp = manifests.get(ptr).stamp
|
|
val stamp = if (FIX_TIMESTAMPS) max(now + skew, parentStamp + 1) else now + skew
|
|
all {
|
|
ptr' = nextVersion,
|
|
manifests' = manifests.put(nextVersion, { refs: pr.ws, stamp: stamp }),
|
|
nextVersion' = nextVersion + 1,
|
|
landed' = landed.union(okRefs.map(r => (p, r))),
|
|
// On lease loss: 503 "community write lease lost"; no 30618 is emitted.
|
|
push' = push.set(p,
|
|
if (leaseLostAfterCas and not(FIX_LEASE))
|
|
{ ...pr, phase: "done", told: pr.targets.mapBy(_ => "fail") }
|
|
else
|
|
{ ...pr, phase: "committed", stamp: stamp }),
|
|
},
|
|
},
|
|
events' = events, now' = now,
|
|
}
|
|
|
|
// Derived kind:30618 insert, then the success response.
|
|
action emit(p: int): bool = all {
|
|
val pr = push.get(p)
|
|
val usedIds = events.map(e => e.id)
|
|
all {
|
|
pr.phase == "committed",
|
|
nondet id = EVENT_IDS.exclude(usedIds).oneOf()
|
|
events' = events.union(Set({ createdAt: pr.stamp, id: id, refs: pr.ws })),
|
|
push' = push.set(p, { ...pr, phase: "done", told: visible(pr) }),
|
|
},
|
|
ptr' = ptr, manifests' = manifests, nextVersion' = nextVersion,
|
|
now' = now, landed' = landed,
|
|
}
|
|
|
|
action tick = all {
|
|
now < MAX_TIME,
|
|
now' = now + 1,
|
|
ptr' = ptr, manifests' = manifests, nextVersion' = nextVersion,
|
|
events' = events, push' = push, landed' = landed,
|
|
}
|
|
|
|
action step = any {
|
|
nondet p = PUSHERS.oneOf()
|
|
any { advertise(p), receive(p), finalizeNoPublish(p), commit(p), emit(p) },
|
|
tick,
|
|
}
|
|
|
|
// ---- Observations --------------------------------------------------------
|
|
|
|
// The 30618 a reader picks: newest created_at, then lowest id.
|
|
def latestEvent: Event =
|
|
events.fold({ createdAt: -1, id: 0, refs: INITIAL_REFS }, (best, e) =>
|
|
if (e.createdAt > best.createdAt or (e.createdAt == best.createdAt and e.id < best.id)) e
|
|
else best)
|
|
|
|
def quiescent: bool = PUSHERS.forall(p => push.get(p).phase == "done")
|
|
|
|
// ---- Invariants ----------------------------------------------------------
|
|
|
|
// A ref the client printed as pushed reached the published pointer.
|
|
val noFalseSuccess: bool = PUSHERS.forall(p =>
|
|
val t = push.get(p).told
|
|
t.keys().forall(r => t.get(r) == "ok" implies landed.contains((p, r))))
|
|
|
|
// A ref the client was told failed did not reach the published pointer.
|
|
val noFalseFailure: bool = PUSHERS.forall(p =>
|
|
val t = push.get(p).told
|
|
t.keys().forall(r => t.get(r) == "fail" implies not(landed.contains((p, r)))))
|
|
|
|
// Once pushes settle, the ref state readers see matches the pointer.
|
|
val refStateMatchesPointer: bool =
|
|
quiescent implies latestEvent.refs == manifests.get(ptr).refs
|
|
|
|
// Every publication changes the refs. A manifest whose refs equal its
|
|
// predecessor's records no push, yet its kind:30618 names the caller as the
|
|
// pusher. Versions are allocated in pointer order, so the predecessor of
|
|
// version v is v - 1.
|
|
val publicationChangesRefs: bool = 1.to(nextVersion - 1).forall(v =>
|
|
manifests.get(v).refs != manifests.get(v - 1).refs)
|
|
|
|
val safety: bool = and {
|
|
noFalseSuccess,
|
|
noFalseFailure,
|
|
refStateMatchesPointer,
|
|
publicationChangesRefs,
|
|
}
|
|
}
|
|
|
|
// The code before the fixes.
|
|
module current {
|
|
import buzzgit(PUBLISH_RULE = "no_ng", FIX_LEASE = false, FIX_TIMESTAMPS = false).*
|
|
}
|
|
|
|
// The code as it is.
|
|
module fixed {
|
|
import buzzgit(PUBLISH_RULE = "refs", FIX_LEASE = true, FIX_TIMESTAMPS = true).*
|
|
}
|
|
|
|
// One defect at a time, to attribute each counterexample.
|
|
|
|
// The original rule: violates noFalseSuccess (a partially accepted push is
|
|
// not published) and publicationChangesRefs.
|
|
module partialBugOnly {
|
|
import buzzgit(PUBLISH_RULE = "no_ng", FIX_LEASE = true, FIX_TIMESTAMPS = true).*
|
|
}
|
|
|
|
// The rule that reads the status report: satisfies noFalseSuccess, violates
|
|
// publicationChangesRefs (a request with no commands, or a declined push from
|
|
// a client without report-status, is published).
|
|
module reportRuleOnly {
|
|
import buzzgit(PUBLISH_RULE = "report", FIX_LEASE = true, FIX_TIMESTAMPS = true).*
|
|
}
|
|
|
|
module leaseBugOnly {
|
|
import buzzgit(PUBLISH_RULE = "refs", FIX_LEASE = false, FIX_TIMESTAMPS = true).*
|
|
}
|
|
|
|
module timestampBugOnly {
|
|
import buzzgit(PUBLISH_RULE = "refs", FIX_LEASE = true, FIX_TIMESTAMPS = false).*
|
|
}
|
