acpmux: host approvals, and host enroll enrolls this Mac's app key on the machine (peer-route approvals 2/4)
Peer-route approvals, part 2 of 4: enroll this Mac's app key on a peer. Part 1 (#26131) has landed; this PR is on feat-cmux-next.
Part 1 lets a peer count an Allow signed by a Mac listed in its mac-approvers.json. This PR adds the commands that put the Mac in that file, plus the name a refusal needs for the card's hint.
acpmux host approvalslists the Macs that may allow this machine's prompts, and this machine's own app key (thisMac).host approvals add --id ID --key HEX --name NAMEandhost approvals rm IDchange the file under a lock. The file is rewritten whole with 0600 permissions.- After each change the command makes the daemon reload (part 1's
reload), so a removal stops that Mac's Allows at once. The file's lock is held until that reload returns, so a concurrentaddcannot land betweenrm's write and its reload. A running daemon that does not reload fails the command (and so a remoteenroll/unenroll).
host approvals enroll PEER/unenroll PEER, run on the Mac:- reads this Mac's app key from the local daemon (
_acpmux/mac_approversthisMac, which the app sets in part 3); - runs
host approvals add/rmon that peer over ssh, with the same ssh routehost enrolluses.
- reads this Mac's app key from the local daemon (
acpmux host enrollandhost doctorgain an approvals step. It is the same check:- ok when the Mac is enrolled with the same key fingerprint;
- warn with "fix:
acpmux host doctor NAME --fix" when it is not; - fixed after
--fixorenroll; - skip when no cmux app has given a key ("open cmux on this Mac");
- warn "too old" with
acpmux host update NAMEwhen the remote acpmux has nohost approvals. - The Swift HostStep already tolerates unknown steps.
permission_respondrefused by a peer now carriesdata.peer, the local daemon's name for that peer, unless the error names one already. The app uses it for the "enroll this Mac on HOST" hint (parts 3 and 4).
Conditions
- (4) Unenrolling stops Allows at once:
host approvals rm, andunenrollfrom the Mac, rewrite the file and then reload under the set's lock (part 1), holding the file's lock until the reload returns; a reload that fails fails the command. - (5) No private key moves: only the public key and its id cross ssh. No RPC adds a key;
addwrites the peer's file as the ssh user.
Tests (they fail before the fix and pass after)
They ran remotely through cmux-ci test.
Before: the enroll step taken out, and no peer name on a refusal.
test server::peer_forward::tests::a_refused_answer_names_the_peer ... FAILED
test cli::host_approvals::tests::enroll_adds_this_macs_app_key_once_and_doctor_finds_it ... FAILED
Before (review round): the lock let go before the reload, and a reload failure ignored.
test cli::host_approvals::tests::a_daemon_that_does_not_reload_fails_the_change ... FAILED
test cli::host_approvals::tests::a_change_holds_its_lock_until_the_reload_returns ... FAILED
After:
test cli::host_approvals::tests::no_app_key_skips_and_an_old_remote_warns_with_the_update ... ok
test cli::host_approvals::tests::enroll_adds_this_macs_app_key_once_and_doctor_finds_it ... ok
test server::peer_forward::tests::a_refused_answer_names_the_peer ... ok
test cli::host_approvals::tests::a_change_rewrites_the_file_whole_and_keeps_each_mac_once ... ok
test cli::host_approvals::tests::a_change_holds_its_lock_until_the_reload_returns ... ok
test cli::host_approvals::tests::a_daemon_that_does_not_reload_fails_the_change ... ok
lib (filtered, review round): 46 passed; clippy -D warnings and fmt --check clean
lib (filtered): 56 passed; peer_integration: 49 passed; person_allow: 25 passed; clippy -D warnings clean
No capture: CLI and daemon only, with no app or webview change. Part 3 carries the card captures.
Overlap: #25822 (an update step in host enroll) changes the same step list. Whichever lands second rebases.
Agent session: agent session
š¤ Generated with Claude Code