fargo
19ad93999f
MOSAIC_GIT_IDENTITY=fargo produced objects attributed to mos-dt-0: every write wrapper resolved its acting principal from tea's login list, which enumerates whatever logins the host happens to hold and knows nothing about which seat is calling. The identity-aware code was present and correct but unreachable on the happy path — it sat on arms that only ran when tea failed. One shared resolver, not twenty patches: resolve_gitea_principal() in detect-platform.sh implements the precedence (explicit --login beats MOSAIC_GIT_IDENTITY / worktree git config mosaic.gitIdentity; the tea login list is the LAST resort), fails loud (nonzero, naming the identity or login and the expected slot path) when the requested principal has no credential, and never prints a token value. gitea_identity_token_slot() is the single source of truth for the slot layout, shared with get_gitea_token, so resolver and token resolution cannot disagree. Call-site conversions (the proving five): pr-review.sh (principal resolved once for every action; the comment action now honors --login), issue-comment.sh, pr-create.sh (identity mode reaches the REST API on the HAPPY path — tea is never consulted, so the login list cannot shadow the identity; --login wins even on the tea-failure fallback arm), issue-create.sh (same), pr-merge.sh (gains --login; --dry-run reports the principal the merge WOULD act as, resolved exactly as the merge resolves it; no cross-principal fallback — an identity-bound 401 is a hard stop). Remaining wrappers are call-site conversions onto the same resolver, measured: write-path issue-assign, issue-close, issue-edit, issue-reopen, milestone-close, milestone-create, pr-close; read-path issue-list, milestone-list, pr-list, pr-view (issue-view mixed). pr-diff, pr-metadata, pr-ci-wait and ci-queue-wait already inherit identity-first resolution via get_gitea_token. Known interaction: on a host with a workstation-GLOBAL mosaic.gitIdentity, this fix activates identity mode for every seat that has not set a local one — correct behavior driven by a wrong configuration (measured: #1282-#1287, six accidental live issues, closed with provenance by fred). Set mosaic.gitIdentity per-worktree, never --global. Tests: test-gitea-principal-resolution.sh (resolver matrix — identity present/absent, --login precedence, env vs git-config, unrecognized-host containment, slot-path-by-path-never-by-value); test-pr-create-identity- first.sh (the load-bearing ordering test: identity arm REACHED on the happy path with tea never invoked, fail-loud BEFORE any write on a missing slot, --login wins, default preserved); test-pr-merge-principal- resolution.sh (dry-run truthfulness, merge credential binding, unknown --login never reaches the provider). All wired into test:framework-shell. Sabotage control: precedence inverted to tea-list-first inside the resolver -> exactly the three new suites redden with the #1280 signatures (identity resolves to the tea-list account; missing slot returns rc=0 with silent fallthrough) while all 11 pre-existing git suites stay green; restored byte-identical (sha256 verified); all 14 green again.
127 lines
13 KiB
Markdown
127 lines
13 KiB
Markdown
# Git provider wrappers
|
|
|
|
These scripts provide host-aware GitHub and Gitea issue, pull-request, milestone, and CI operations.
|
|
|
|
## Durable review provenance
|
|
|
|
A successful provider write command—or a wrapper message based only on that command's exit code—is **not** durable review provenance. Review comments, approvals, and change requests count as durable provenance only after the wrapper reads the created provider record back and verifies that it was created by _this_ write.
|
|
|
|
**The write is a direct Gitea REST `POST` that returns the created record's id.** Neither wrapper writes through `tea` — tea 0.11.1 can silently no-op while exiting 0 and cannot emit the id of a record it creates, so its exit code is worthless as proof of a durable write (#865). Instead:
|
|
|
|
- Comments (`issue-comment.sh`, and the `comment` action of `pr-review.sh`) `POST /api/v1/repos/{owner}/{repo}/issues/{index}/comments`, requiring a `201` and parsing the created comment's `id` from the response body.
|
|
- Reviews (`approve` / `request-changes`) `POST /api/v1/repos/{owner}/{repo}/pulls/{index}/reviews` with the `event` (`APPROVED` / `REQUEST_CHANGES`), the review `body`, and `commit_id` pinned to the PR's current head, then parse the created review's `id`. The review body travels _in the review submit itself_ — there is no separate detached comment to reconcile (a Gitea `REQUEST_CHANGES` review requires a non-empty body, which the submit carries).
|
|
|
|
**Verification keys on that exact provider-returned id.** The wrapper then `GET`s that one record directly — `GET /issues/comments/{id}` or `GET /pulls/{n}/reviews/{id}` — and requires that its `id` equals the created id, its **author login equals the acting identity** (resolved via `GET /api/v1/user` for the token in use), and, for comments, its body exactly matches what was submitted **and its returned web URL belongs to this exact provider and repository** (the `issue_url` / `pull_request_url` origin — scheme, host, and effective port — and full path, i.e. deployment prefix + exact `owner/repo` + kind + number, must match; a suffix/`endsWith` test would accept a look-alike host or a decoy path prefix, so the whole normalized URL is compared). The `comment` action of `pr-review.sh` additionally requires the returned resource be a **pull request** (a populated `pull_request_url`); a bare `issue_url` is rejected, so if issue `#N` exists but PR `#N` does not, an issue comment cannot be reported as a verified PR comment. (`issue-comment.sh` legitimately keeps the broader issue-or-PR acceptance.) For reviews, its state matches the requested action, its reviewed `commit_id` equals the PR head, **and its persisted body equals the submitted body** — an exact, presence- and type-checked equality (a missing/`null` persisted body no longer counts as an empty match), because Gitea can finalize/reuse a pending review id whose stored content was authored elsewhere, so the body is bound too. The write, the `/user` identity lookup, and the read-back all use the **same** credential — the effective login's token, or the host credential when no login is named — so the write is verified against the identity that actually performed it.
|
|
|
|
**A review's pinned head is re-checked after verification (current-head TOCTOU).** The `commit_id` is pinned to the PR head read _before_ the submit; between that read and the read-back the branch could advance (a force-push or a new commit), leaving a verified review attached to a now-superseded commit while the live tip carries unreviewed code. After the exact-id read-back succeeds, the wrapper re-reads the live PR head (`GET …/pulls/{n}`) and requires it still equals the submitted SHA; if the head advanced it fails closed (non-zero, no success line) rather than reporting a review that no longer covers the PR's current commit.
|
|
|
|
**This closes the concurrency window rather than documenting it.** Because verification keys on the id the create returned, a no-op create yields no id and fails closed with no list-scan fallback, and a _concurrent_ record — even one written by the _same_ identity with an identical body/state — has a _different_ id and cannot be mistaken for this write. There is no residual same-identity window: the earlier boundary-and-author heuristic (accept any `id > pre-write-max` with a matching author) is replaced entirely by exact-id attribution.
|
|
|
|
**Exact-id read-back is the sole authority.** Verification is a direct `GET` of the one record the create returned; there is no follow-up list enumeration. An earlier redundant pass that re-listed the record's page (`?limit=&page=1,2,…`) was removed: server-capped page sizes and list-pagination quirks made it a false-failure source (a durable, exact-id-verified record could be missed by a non-exhaustive enumeration), and it added nothing over the authoritative exact-id `GET`.
|
|
|
|
## Credential handling
|
|
|
|
The Gitea API token is **never passed on a curl command line.** An `Authorization: token <value>` argument would be visible to any local process that can read the process table (`ps` / `/proc/<pid>/cmdline`) for the lifetime of the request. Instead, every authenticated curl call writes the header into a private, mode-`0600` config file under `$TMPDIR` and passes it with `curl --config <file>` (`gitea_write_auth_config`), so only the file _path_ — never the token — appears in argv. Each such file is unlinked on every exit path (success and failure) by the caller's `RETURN` trap.
|
|
|
|
## `tea` invocation notes (Gitea)
|
|
|
|
- tea v0.11.1 has **no `comment` subcommand under `tea pr` or `tea issue`** — the `tea pr comment` / `tea issue comment` forms don't error, they silently fall through to a no-op and still exit 0, producing a false-success write (#865). tea's write subcommands (`tea comment`, `tea pr approve`/`reject`) also cannot report the id of the record they create, so their exit code cannot prove a durable write. These wrappers therefore do **not** write reviews or comments through `tea` at all; they use direct Gitea REST `POST`s that return the created record's id (see "Durable review provenance" above). `tea` is consulted only to enumerate the login list for host→login resolution.
|
|
- Because the review body is carried in the `POST …/reviews` submit itself, there is no separate detached review comment, and the historical `tea pr approve`/`reject` trailing-positional-argument vs. nonexistent `--comment`/`-comment` flag hazard (#835) no longer applies to these wrappers — no review comment is ever passed to `tea`.
|
|
|
|
### `--login` override
|
|
|
|
Both `pr-review.sh` and `issue-comment.sh` accept an optional `--login <name>` flag that overrides the automatically detected Gitea login for that single invocation (as of #1280, `pr-create.sh`, `pr-merge.sh` and `issue-create.sh` accept it too, and it wins over `MOSAIC_GIT_IDENTITY` everywhere). The override selects **which credential the REST write, the `/user` identity lookup, and the read-back all use** — its token is resolved from the tea config for that login name (`get_gitea_token_for_login`), falling back to the repo host's credential when no login is named. The resolved login is **host- and port-bound**: the login's configured URL host **and effective port** (the scheme's default port — 80 for `http`, 443 for `https` — applies when a port is omitted, symmetrically on both sides) must match the repo remote's, so a login name shared across hosts (or an override configured for a different Gitea, including one on a different port of the same host) can never send one host's credential to another — a host or port mismatch fails closed rather than leaking a cross-host token. Resolving the acting identity and the read-back from the _same_ login that performs the write is essential: a write performed under an overridden login must be verified against that login's identity, not the host default's. Callers who need a different login than the host default should pass `--login <reviewer-login>`.
|
|
|
|
As a durable successor to this mechanism, consider giving each reviewer/approver slot its own dedicated Gitea login credential, so that author≠reviewer holds at the credential level rather than relying on wrapper-level `--login` bookkeeping. This is a recommendation for future hardening, not something implemented by this flag.
|
|
|
|
## Per-agent Gitea identity (Gate-16 author≠reviewer)
|
|
|
|
By default, git push/fetch (via `git-credential-mosaic`) and the API wrappers above (via
|
|
`detect-platform.sh`'s `get_gitea_token`) all authenticate as the single shared Gitea
|
|
account/token configured through `tools/_lib/credentials.sh`. That means every agent in a
|
|
fleet commits, pushes, and opens PRs under one identity — with no cryptographic
|
|
separation between an author and a reviewer.
|
|
|
|
Both `git-credential-mosaic` and `get_gitea_token()` resolve an optional **per-agent
|
|
identity** before falling back to the shared account:
|
|
|
|
1. `MOSAIC_GIT_IDENTITY` environment variable, or
|
|
2. `git config --get mosaic.gitIdentity` (set per-worktree; persists on disk across
|
|
non-persistent shells — `git config mosaic.gitIdentity <agent-id>`), or
|
|
3. (git-credential-mosaic only) the username git itself supplies for the credential
|
|
request.
|
|
|
|
If the resolved identity has a token file at
|
|
`~/.config/mosaic/secrets/gitea-tokens/gitea-{usc,mosaicstack}-<agent-id>.token`, that
|
|
identity + token is used. **Nothing configured → nothing changes**: with no per-slot
|
|
token file present, both tools fall through to the existing shared-account path
|
|
unchanged, so this feature is a no-op on any host that hasn't provisioned per-slot
|
|
tokens.
|
|
|
|
### Identity-first principal resolution in the wrappers (#1280)
|
|
|
|
`resolve_gitea_principal()` (detect-platform.sh) gives the write wrappers —
|
|
`pr-create.sh`, `pr-merge.sh`, `pr-review.sh`, `issue-create.sh`, `issue-comment.sh` —
|
|
ONE precedence for choosing the acting principal:
|
|
|
|
1. an explicit `--login <name>` (now accepted by all five; operator intent beats
|
|
environment), then
|
|
2. the per-agent identity above (`MOSAIC_GIT_IDENTITY` env / worktree
|
|
`mosaic.gitIdentity`) when a per-slot token exists — the wrapper then writes via the
|
|
REST API with that identity's token and never consults `tea`, so the tea login list
|
|
cannot shadow the requested principal, then
|
|
3. the tea login list — the LAST resort, never the first, because it enumerates
|
|
whatever logins the host happens to hold and knows nothing about which seat is
|
|
calling.
|
|
|
|
A requested identity whose per-slot token is absent, or a `--login` whose token cannot
|
|
resolve host-bound, **fails loud** (nonzero, naming the identity/login and the expected
|
|
slot) instead of silently writing under whatever account `tea` has configured — that
|
|
silent fallthrough is defect #1280 (reviews, comments, merges, PRs and issues filed
|
|
under the wrong account). `pr-merge.sh --dry-run` reports the principal the merge would
|
|
act as, resolved exactly as the real merge resolves it. ⚠ A **workstation-global**
|
|
`mosaic.gitIdentity` shadows every seat on that host (a fresh clone with no local value
|
|
resolves the global one) — set it per-worktree, not with `--global`.
|
|
|
|
The resolver is covered by `test-gitea-principal-resolution.sh`; the happy-path
|
|
ordering (identity arm REACHED, not sitting behind a tea failure) by
|
|
`test-pr-create-identity-first.sh`; merge credential binding by
|
|
`test-pr-merge-principal-resolution.sh`.
|
|
|
|
### Enabling it for a clone
|
|
|
|
The framework installer syncs `git-credential-mosaic` to
|
|
`~/.config/mosaic/tools/git/git-credential-mosaic` (executable) on every install/update,
|
|
but does **not** register it as git's credential helper automatically. Registration is a
|
|
one-time, explicit step:
|
|
|
|
```bash
|
|
# Per-repo (recommended — scopes the helper to this clone only):
|
|
git config credential.helper "$HOME/.config/mosaic/tools/git/git-credential-mosaic"
|
|
|
|
# Per-worktree identity pin (Gate-16 separation):
|
|
git config mosaic.gitIdentity <agent-id>
|
|
```
|
|
|
|
This is deliberately **not** auto-registered on install/update: `credential.helper` is
|
|
global, order-sensitive git config (`~/.gitconfig`) that can already hold an
|
|
operator-chosen credential manager (keychain, `store`, `manager-core`, …) for
|
|
repositories unrelated to Mosaic. Silently inserting an entry on every framework
|
|
install/upgrade risks reordering or shadowing that operator-owned surface across the
|
|
whole host — the same operator-owned config the installer's manifest system is
|
|
otherwise careful never to touch. Because identity is already resolved per-worktree
|
|
(`mosaic.gitIdentity`), the correct granularity for registering the helper is per-clone
|
|
too, so a documented manual step is the right shape here, not a global auto-write.
|
|
|
|
### PowerShell parity
|
|
|
|
`detect-platform.ps1`'s Gitea wrappers authenticate through `tea` CLI logins
|
|
(`Get-GiteaLoginForHost`), not a raw-token `get_gitea_token`-equivalent function — there
|
|
is nothing to prepend the identity-resolution block to on the PowerShell side. A native
|
|
PowerShell git-credential helper is also unnecessary: `git-credential-mosaic` is invoked
|
|
by git's credential-helper protocol (stdin/stdout), which works identically under Git for
|
|
Windows' bundled `bash`/`sh` when configured via `credential.helper`, without a `.ps1`
|
|
counterpart. A `tea`-login-based per-agent identity for the PowerShell wrappers is a
|
|
separate, larger design (mapping identities to `tea login` profiles) and is out of scope
|
|
here.
|