salvage 2026-11-06: uncommitted work from scratch/darkwing-r240 (disk cleanup #824)
This commit is contained in:
1 parent
d99166ade2
commit
417c41e2ba
4 files changed
+105
-16
No files matched your search
+36
-3
@@ -837,8 +837,9 @@ user's clone `<home>/src/mosaic-stack`:
|
||||
`--copy` (which also starts the bus, then the Console), A5 `confirm`.
|
||||
The driver writes the new args file beside the old one before A2
|
||||
(`args-failed`, exit 3) and moves it into place after A5. A failed move
|
||||
exits 1 `args-failed`: the new copy is live and confirmed, and root puts
|
||||
the file in place by hand.
|
||||
exits 5 `args-failed`: the new copy is live and confirmed, the args file
|
||||
still names the old one, and root moves the new file (the result line
|
||||
names it) into place by hand.
|
||||
|
||||
A failure in A2 or a stage that exits 3 starts the old units again and gates
|
||||
them (A2f). A later failure stops both units, runs `revert`, renders the old
|
||||
@@ -854,11 +855,43 @@ against a fixed pattern (`BACKUP_STORE none` otherwise). The step log
|
||||
`<time> result exit=N <code> <text>` line.
|
||||
|
||||
Exit 0 ok, 1 failed with the old stack running and gated, 2 rollback-failed
|
||||
with both units stopped, 3 refused with nothing stopped, 4 usage. A refusal
|
||||
with both units stopped, 3 refused with nothing stopped, 4 usage, 5
|
||||
args-failed with the new stack live and confirmed. A refusal
|
||||
after step 2 leaves the user's clone fast-forwarded and the new copy made. After exit
|
||||
2 the activation stays open, so the next run's plan refuses until root
|
||||
finishes it.
|
||||
|
||||
#### Root's host check (`scripts/case1-hostcheck.sh`, row 240)
|
||||
|
||||
```
|
||||
/usr/local/lib/mosaic-stack/hostcheck.sh --check | --enforce | --upstream
|
||||
```
|
||||
|
||||
Installed from `scripts/case1-hostcheck.sh` as `hostcheck.sh`, with
|
||||
`scripts/case1-pins.sh` beside it (`docs/guides/host-run-sheet.md` section 4).
|
||||
The pins are the profile's sha256, the `apparmor-profiles` version it came
|
||||
from and the bubblewrap install pin; changing one is a reviewed commit.
|
||||
Seven items, one `ok N` or `FAIL N` line each: the profile file matches the
|
||||
pin and no package owns it; `aa-status` has `bwrap` and `unpriv_bwrap` in
|
||||
enforce mode and no `mosaic-bwrap`; no other file under `/etc/apparmor.d`
|
||||
names `bwrap`; a bwrap child under the units' no-new-privs reads
|
||||
`bwrap//&unpriv_bwrap (enforce)`; `/usr/bin/bwrap` is `root mosaic 0750` by
|
||||
the statoverride and by `stat`; the user-namespace restriction and
|
||||
`fs.protected_hardlinks` are 1; `net.ipv4.ip_unprivileged_port_start` is
|
||||
above the Console unit's `--port`, or above 1023 with no unit. A `note` line
|
||||
says whether bubblewrap is the install pin and never fails.
|
||||
|
||||
`--check` exits 0 or 1; `stack-upgrade.sh` refuses `profile-drift` on 1.
|
||||
`--enforce` exits 0. On a failure, or while `/etc/mosaic-stack/DRIFT` exists,
|
||||
it unloads the profile if loaded, sets `/usr/bin/bwrap` to `root:root` 0700,
|
||||
appends the failed items to `DRIFT` and one line to
|
||||
`/var/log/mosaic-stack/hostcheck.log`. It never writes the statoverride. The
|
||||
apt hook runs it after every package run, and `mosaic-hostcheck.service`
|
||||
(`packages/cli/systemd/`) at boot before the bus. `--upstream` compares the
|
||||
`apparmor-profiles` candidate's profile to the pin, prints any difference
|
||||
and exits 0, or 1 when the download fails. Exit 2 is usage or a refusal:
|
||||
root takes no `--root` (the test seam), and other users run only with it.
|
||||
|
||||
## Console service (`scripts/webui-service.sh`)
|
||||
|
||||
```bash
|
||||
|
||||
@@ -66,8 +66,10 @@ The pin is 2.1.304 unless the window names a newer one.
|
||||
|
||||
```sh
|
||||
install -d -o root -g root -m 0755 /opt/mosaic-stack/claude-<pin> /etc/claude-code
|
||||
npm install --prefix /opt/mosaic-stack/claude-<pin> @anthropic-ai/claude-code@<pin>
|
||||
PATH=/opt/mosaic-stack/node-<v>/bin:/usr/sbin:/usr/bin:/sbin:/bin \
|
||||
npm install --prefix /opt/mosaic-stack/claude-<pin> @anthropic-ai/claude-code@<pin>
|
||||
chown -R root:root /opt/mosaic-stack/claude-<pin>
|
||||
/opt/mosaic-stack/claude-<pin>/node_modules/@anthropic-ai/claude-code/bin/claude.exe --version
|
||||
printf '%s\n' '{"env":{"DISABLE_AUTOUPDATER":"1"}}' > /etc/claude-code/managed-settings.json
|
||||
chown root:root /etc/claude-code/managed-settings.json
|
||||
chmod 0644 /etc/claude-code/managed-settings.json
|
||||
@@ -75,8 +77,16 @@ chmod 0644 /etc/claude-code/managed-settings.json
|
||||
|
||||
Rollback: `rm -r /opt/mosaic-stack/claude-<pin> /etc/claude-code/managed-settings.json`.
|
||||
|
||||
The args file's `--claude` names the binary under `/opt/mosaic-stack/claude-<pin>`. `case2-unit.sh`
|
||||
refuses one that isn't a root-owned regular file outside the home.
|
||||
Root's PATH has no npm, so the install line puts section 2's pinned node first; the package's postinstall
|
||||
also runs `node`. The `--version` line must print `<pin> (Claude Code)`. Anything else means the postinstall
|
||||
left its 500-byte stub in `bin/claude.exe` (no native package for the platform, or scripts were off): stop and
|
||||
roll back.
|
||||
|
||||
The args file's `--claude` is
|
||||
`/opt/mosaic-stack/claude-<pin>/node_modules/@anthropic-ai/claude-code/bin/claude.exe`, the regular file the
|
||||
postinstall hardlinks or copies the native binary to. Not `node_modules/.bin/claude`: that is npm's symlink
|
||||
to it, and `case2-unit.sh` refuses a symlink, as it does anything that isn't a root-owned regular file outside
|
||||
the home. Checked against the 2.1.304 package's `install.cjs`; a newer pin needs the same check.
|
||||
|
||||
Precheck lines:
|
||||
- `ok claude replaces its prompt with --system-prompt-file (<n> input tokens)`. It runs the claude the bus
|
||||
@@ -120,17 +130,41 @@ lists no member, and `sysctl fs.protected_hardlinks` prints 1. `sysctl
|
||||
kernel.apparmor_restrict_unprivileged_userns` prints 1 too (Ubuntu 24.04's default); leave it, so nothing
|
||||
else on the host gains user namespaces.
|
||||
|
||||
The drift stop is row 240's (I4, #1746): `hostcheck.sh` and its pins in `/usr/local/lib/mosaic-stack/`, the
|
||||
apt hook `/etc/apt/apt.conf.d/80mosaic-hostcheck`
|
||||
(`DPkg::Post-Invoke { "/usr/local/lib/mosaic-stack/hostcheck.sh --enforce || true"; };`) and the boot unit
|
||||
`mosaic-hostcheck.service`. Install them from row 240's run sheet lines once it lands. Until then
|
||||
`stack-upgrade.sh` refuses `profile-drift` on every run, because it runs `hostcheck.sh --check` and a
|
||||
missing file refuses.
|
||||
The drift stop (row 240, I4, #1746) goes in last, after the profile and the statoverride. As root, from
|
||||
the root-owned checkout of the reviewed commit:
|
||||
|
||||
```sh
|
||||
install -d -o root -g root -m 0755 /usr/local/lib/mosaic-stack
|
||||
install -o root -g root -m 0755 scripts/case1-hostcheck.sh /usr/local/lib/mosaic-stack/hostcheck.sh
|
||||
install -o root -g root -m 0644 scripts/case1-pins.sh /usr/local/lib/mosaic-stack/case1-pins.sh
|
||||
printf '%s\n' 'DPkg::Post-Invoke { "/usr/local/lib/mosaic-stack/hostcheck.sh --enforce || true"; };' \
|
||||
> /etc/apt/apt.conf.d/80mosaic-hostcheck
|
||||
install -o root -g root -m 0644 packages/cli/systemd/mosaic-hostcheck.service /etc/systemd/system/
|
||||
systemctl daemon-reload && systemctl enable mosaic-hostcheck.service
|
||||
/usr/local/lib/mosaic-stack/hostcheck.sh --check
|
||||
```
|
||||
|
||||
`--check` prints one `ok` line for each of its seven items and exits 0. Item 7 reads 1023 as the port
|
||||
until I2 installs the Console unit (section 10), then the unit's `--port`. `stack-upgrade.sh` runs `--check`
|
||||
before its plan and refuses `profile-drift` on any exit but 0, a missing file included. Rollback:
|
||||
`systemctl disable mosaic-hostcheck.service`, then `rm` the unit, the hook file and
|
||||
`/usr/local/lib/mosaic-stack`.
|
||||
|
||||
On drift, `--enforce` (the apt hook after every package run, and the unit at boot) unloads the profile,
|
||||
closes `/usr/bin/bwrap` to `root:root` 0700, appends the failed items to `/etc/mosaic-stack/DRIFT` and logs
|
||||
a line in `/var/log/mosaic-stack/hostcheck.log`. Every role session then refuses to start. ops-01 reads the
|
||||
log in each STATE report and sends any `DRIFT` to Mos. Only root removes `DRIFT`, in a reviewed step with
|
||||
a new pin or a Mos go. After that, `chown root:mosaic /usr/bin/bwrap`, `chmod 0750 /usr/bin/bwrap` and
|
||||
`apparmor_parser -r /etc/apparmor.d/bwrap-userns-restrict` put bwrap back, and `--check` must exit 0.
|
||||
|
||||
Before each re-pin window, ops-01 runs `/usr/local/lib/mosaic-stack/hostcheck.sh --upstream`. It
|
||||
downloads the `apparmor-profiles` candidate and compares its `bwrap-userns-restrict` to the pin. A
|
||||
`DIFFERS` line goes to Mos as a new-pin request; it refuses nothing.
|
||||
|
||||
Precheck lines:
|
||||
- `ok bwrap --unshare-all runs`
|
||||
- The AppArmor profile, the statoverride, the no-new-privs result and the P9 checks: precheck line missing.
|
||||
A line that runs `/usr/local/lib/mosaic-stack/hostcheck.sh --check` would cover them once row 240 lands.
|
||||
`/usr/local/lib/mosaic-stack/hostcheck.sh --check` covers them (row 240).
|
||||
|
||||
## 5. The port floor
|
||||
|
||||
@@ -187,6 +221,9 @@ When a run doesn't exit 0, send Mos the exit and the last lines of `/var/log/mos
|
||||
it is finished with `confirm` or `revert`. One way here: a unit that doesn't stop within `--timeout`
|
||||
keeps its old start time, A2f's gate fails it `stale-start`, and the driver stops both (duckworth-0055
|
||||
N1). That is on purpose; a unit that won't stop is a reason to stop.
|
||||
- Exit 5: `args-failed`. The new copy is live and passed confirm, but `/etc/mosaic-stack/dev.args` still names
|
||||
the old copy. The next run refuses `args-differ`, and a render from that file would put the old copy back.
|
||||
Move the file the result line names into place with `mv -f`. The two differ only in the `--copy` value.
|
||||
|
||||
Precheck lines: none. Root's checkout at `<sha>` and the stack's user's clone: precheck line missing.
|
||||
After install, `stack-copy.sh check --units external` reads the copy the units run.
|
||||
@@ -209,6 +246,8 @@ their sudoers line and the sshd drop-in `/etc/ssh/sshd_config.d/<nn>-mosaic-keys
|
||||
it (`hosts.enroll`, the `host-enroll` decision) are rows 234 and 235, not yet on refactor. This item has no
|
||||
commands until they land.
|
||||
|
||||
Precheck line: none. The enrolled host's key and its `mosaic-keys` sudoers line: precheck line missing.
|
||||
|
||||
## 9. Credential slots
|
||||
|
||||
Jason places these, all in one sitting per host. No value appears here or in any message. Check a placed
|
||||
@@ -238,3 +277,5 @@ leaves.
|
||||
|
||||
None by hand. I2's `case2-unit.sh` enables both units, starts the bus, then the Console (Q189, mos-1122).
|
||||
`stack-upgrade.sh` stops and starts both units itself.
|
||||
|
||||
Precheck line: none. Both units active after the render: precheck line missing.
|
||||
@@ -140,7 +140,7 @@ const arm=(e,key,text)=>writeFileSync(join(e.sd,'arm',key),text);
|
||||
|
||||
// The step log: every line `<time> <step> rc=N ...` or the result line, root:root 0640 (here the
|
||||
// test user's), and nothing the stack's user printed. Returns the lines without the time.
|
||||
const STEP=/^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\dZ (start|fetch|ff|copy|hostcheck|units|plan|rehearse|rehearse-store|rehearsal-skipped|stop-console|stop-bus|wait-down|stage|render|confirm|args|revert|render-old|confirm-rollback|gate|start-bus|start-console|stop-units) rc=\d+ |^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\dZ result exit=[0-3] [a-z-]+ /;
|
||||
const STEP=/^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\dZ (start|fetch|ff|copy|hostcheck|units|plan|rehearse|rehearse-store|rehearsal-skipped|stop-console|stop-bus|wait-down|stage|render|confirm|args|revert|render-old|confirm-rollback|gate|start-bus|start-console|stop-units) rc=\d+ |^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\dZ result exit=[0-35] [a-z-]+ /;
|
||||
function slog(e){
|
||||
const l=lines(e.slog);
|
||||
for(const x of l){assert.match(x,STEP);assert.ok(!/stack-release:|fixture rehearse|PASS |FAIL |REHEARSAL/.test(x),x)}
|
||||
@@ -292,6 +292,20 @@ test('row 233: sequence 7: two upgrades and a rollback --to the previous copy wi
|
||||
assert.equal(lines(join(e.sd,'root-systemctl.log')).length,sc);assert.equal(argsCopy(e),C1);
|
||||
});
|
||||
|
||||
test('row 240: I3 N1: a failed args move after A5 exits 5 args-failed, the new copy live and confirmed and both args files kept',async(t)=>{
|
||||
const e=await useed(t);
|
||||
// A read-only /etc/mosaic-stack at confirm: the stage and the render are done, and the move fails.
|
||||
arm(e,'confirm.sh',`chmod 0555 ${e.etc}\n`);t.after(()=>chmodSync(e.etc,0o755));
|
||||
const l=await upgrade(e,C1);assert.equal(l.code,5,l.all);
|
||||
assert.deepEqual(names(e),[...PRE,...A2,'stage','render','confirm','args','result']);
|
||||
assert.ok(slog(e).includes(`args rc=1 copy: ${C1}`));
|
||||
assert.match(result(e),new RegExp(`^result exit=5 args-failed ${C1} is live and confirmed, but ${e.args} still names ${B}; put ${e.etc}/\\.dev\\.args\\.\\w{6} in its place$`));
|
||||
assert.deepEqual(open(e),[]);assert.deepEqual(live(e),['active','active',C1,C1]);
|
||||
assert.equal(readFileSync(e.args,'utf8'),e.argsText);
|
||||
const left=readdirSync(e.etc).filter((n)=>n!=='dev.args');assert.equal(left.length,1);
|
||||
assert.equal(readFileSync(join(e.etc,left[0]),'utf8'),e.argsText.replace(`--copy\n${B}\n`,`--copy\n${C1}\n`));
|
||||
});
|
||||
|
||||
test('row 233: sequence 8: a migration that writes and fails: the driver reverts to the backup byte for byte, --cause A3: exit 1',async(t)=>{
|
||||
const e=await useed(t);
|
||||
const s0=sha(e.store);
|
||||
|
||||
@@ -27,7 +27,8 @@
|
||||
# <argv>`, and a last `<time> result exit=N <code> <text>` line.
|
||||
#
|
||||
# Exit 0 ok, 1 failed with the old stack running, 2 rollback-failed with the units stopped,
|
||||
# 3 refused with nothing stopped, 4 usage.
|
||||
# 3 refused with nothing stopped, 4 usage, 5 args-failed: the new stack is live and confirmed, but
|
||||
# the args file still names the old copy.
|
||||
#
|
||||
# Test seams, for packages/cli/tests/stack-upgrade.test.mjs only. Run as root, it refuses any:
|
||||
# STACK_UPGRADE_ETC default /etc/mosaic-stack
|
||||
@@ -278,7 +279,7 @@ run_steps() {
|
||||
step confirm "${AS_USER[@]}" "$SR" confirm "$id" "$BUSINESS" --units external --copies "$COPIES_DIR" --timeout "$TIMEOUT" ||
|
||||
rollback_to_old "$id" A5
|
||||
if mv -f "$NEW_ARGS" "$ETC/$INSTANCE.args"; then logl "args rc=0 copy: $id"
|
||||
else logl "args rc=1 copy: $id"; finish 1 args-failed "$id is live and confirmed, but $ETC/$INSTANCE.args still names $OLD; put $NEW_ARGS in its place"
|
||||
else logl "args rc=1 copy: $id"; finish 5 args-failed "$id is live and confirmed, but $ETC/$INSTANCE.args still names $OLD; put $NEW_ARGS in its place"
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user