fix(install,admin): use the legacy sys probe at finalize and keep personal preferences out of the system transaction log
Some checks are pending
ci / test (push) Waiting to run
Some checks are pending
ci / test (push) Waiting to run
This commit is contained in:
parent
fa39f773f0
commit
b579633ab1
6 changed files with 114 additions and 22 deletions
|
|
@ -3,6 +3,33 @@
|
||||||
All notable changes are recorded here. The authoritative history is `git log`;
|
All notable changes are recorded here. The authoritative history is `git log`;
|
||||||
this file is the curated, human-readable summary.
|
this file is the curated, human-readable summary.
|
||||||
|
|
||||||
|
## 2026-09-25 — Installed-VM verification fixes (installer finalize probe, personal preference transactions)
|
||||||
|
|
||||||
|
Found while running the acceptance on a fresh disposable installed system:
|
||||||
|
|
||||||
|
- **Installer `finalize` probe used the AI-first path (`phoebus-executor::sys_runtime`).**
|
||||||
|
The target `sys` verification ran `sys history`, which is AI-first and
|
||||||
|
(correctly) refuses to run without a connected model, so a non-interactive
|
||||||
|
`--install --no-ai` aborted at the `finalize` stage with `INSTALL-RC=1`. The
|
||||||
|
offline-safe deterministic probe is now `sys history --legacy`. Unit-tested;
|
||||||
|
`sys history --legacy` succeeds in the booted target (`HIST_RC:0`).
|
||||||
|
- **A personal preference no longer requires the root-owned transaction log
|
||||||
|
(`sys` `execute_action`).** A normal account saving a personal package
|
||||||
|
preference wrote the preference successfully but then failed with permission
|
||||||
|
denied recording it in `/var/lib/phoebus/transactions.toml`, returning a
|
||||||
|
misleading nonzero exit. Personal preferences are user-owned state and are no
|
||||||
|
longer written to the system transaction history; only `requires_root()`
|
||||||
|
actions are recorded. Covered by a CLI regression test that makes the system
|
||||||
|
transaction directory read-only.
|
||||||
|
- **Installed-VM evidence (disposable qcow2, detached boot):** LUKS unlock and
|
||||||
|
login; systemd PID1 `running`; `sys 0.1.0`; `sys history --legacy` exit 0;
|
||||||
|
and `installer/tests/vm/sys-acceptance.sh` with the fixed `sys` reports
|
||||||
|
`SUMMARY PASS=24 FAIL=0`, including `personal-preference PASS saved to user
|
||||||
|
config` and `nonroot-systemwide` correctly refused. The privileged `--broker`
|
||||||
|
plan path and replay rejection are unit-tested at the privileged entry point
|
||||||
|
but were not exercised end-to-end in the VM (no root/Polkit agent on the
|
||||||
|
serial console; `sudo -n` denied).
|
||||||
|
|
||||||
## 2026-09-25 — Bind per-step reviewed effects into the approval digest
|
## 2026-09-25 — Bind per-step reviewed effects into the approval digest
|
||||||
|
|
||||||
- **Per-step effect binding (`phoebus-installer::service`):** the canonical
|
- **Per-step effect binding (`phoebus-installer::service`):** the canonical
|
||||||
|
|
|
||||||
|
|
@ -54,30 +54,44 @@ commit it. It should be short and current; use `git log` for detail.
|
||||||
`transaction::begin` reaches a terminal result.
|
`transaction::begin` reaches a terminal result.
|
||||||
- **Last verified (this session):**
|
- **Last verified (this session):**
|
||||||
- `cargo fmt --all -- --check` clean.
|
- `cargo fmt --all -- --check` clean.
|
||||||
- `cargo test --workspace`: 601 passed, 0 failed. New per-step binding
|
- `cargo test --workspace`: 602 passed, 0 failed. New per-step binding
|
||||||
adversarial tests: single-action and multi-action General plans with
|
adversarial tests: single-action and multi-action General plans with
|
||||||
`step_effects` swapped (with and without a matching aggregate) while the
|
`step_effects` swapped (with and without a matching aggregate) while the
|
||||||
approved digest is retained are rejected before any command, ledger claim or
|
approved digest is retained are rejected before any command, ledger claim or
|
||||||
transaction; a legitimate bound multi-step plan still validates. The prior
|
transaction; a legitimate bound multi-step plan still validates. New CLI
|
||||||
session's adversarial tests (swapped action resealed for every plan kind;
|
regression: a personal preference succeeds when the system transaction
|
||||||
replay after a summary/presentation edit or recreating an identical plan;
|
directory is read-only. The prior session's adversarial tests all still pass.
|
||||||
live-vs-abandoned reconciliation; reconcile-vs-finish; personal ownership;
|
|
||||||
cross-uid refusal) all still pass.
|
|
||||||
- `cargo clippy --workspace --all-targets` exits 0 (only the pre-existing
|
- `cargo clippy --workspace --all-targets` exits 0 (only the pre-existing
|
||||||
`result_large_err`, one arg-count and one `DiskPhase` lints remain).
|
`result_large_err`, one arg-count and one `DiskPhase` lints remain).
|
||||||
- `cargo build --release -p phoebus-installer` clean.
|
- `cargo build --release -p phoebus-installer` clean.
|
||||||
|
- **Disposable installed VM (qcow2, detached boot):** LUKS unlock + login;
|
||||||
|
PID 1 `systemd`, `systemd is-system-running = running`; `sys 0.1.0`;
|
||||||
|
`sys history --legacy` exit 0; `installer/tests/vm/sys-acceptance.sh` with
|
||||||
|
the fixed `sys` reports `SUMMARY PASS=24 FAIL=0` (includes
|
||||||
|
`personal-preference PASS saved to user config` and `nonroot-systemwide`
|
||||||
|
correctly refused).
|
||||||
|
- Two defects found and fixed by the VM run: (a) the installer `finalize`
|
||||||
|
`sys` probe ran the AI-first `sys history` and aborted a `--no-ai` install;
|
||||||
|
it now runs `sys history --legacy` (`phoebus-executor::sys_runtime`,
|
||||||
|
unit-tested); (b) a personal preference wrote the preference but then failed
|
||||||
|
recording it in the root-owned `/var/lib/phoebus/transactions.toml`; personal
|
||||||
|
preferences are now excluded from the system transaction history.
|
||||||
- **Not yet verified this session (BLOCKED):**
|
- **Not yet verified this session (BLOCKED):**
|
||||||
- Installed-VM journey and the 12-step acceptance list. The existing
|
- The privileged `sys --broker --execute-plan` path and replay rejection were
|
||||||
disposable installed disk (`/var/tmp/phoebus-vm/disks/test-disk.qcow2`)
|
**not** exercised end-to-end in the VM: the serial console has no root
|
||||||
reaches the LUKS prompt but **no passphrase in this environment opens it**:
|
access and no Polkit agent (`sudo -n` denied), so `pkexec` elevation cannot
|
||||||
the harness default (`phoebus-luks-test`, which is also the content of
|
complete. These paths remain unit-tested at the `execute_plan_privileged`
|
||||||
`/home/dominic/vmlab/serve/luks.pw`) is rejected, and no other credential is
|
entry point (replacement, recomputed digest, step_effects tampering, replay,
|
||||||
available. Do not guess or brute-force.
|
concurrency, interruption). A graphical/seat-providing VM or a
|
||||||
|
passwordless-sudo test image is required for the end-to-end run.
|
||||||
|
- The existing `test-disk.qcow2` still cannot be unlocked (unknown passphrase);
|
||||||
|
do not guess or brute-force. A clean re-install with the fixed installer is
|
||||||
|
running at the time of writing (`verify-disk2.qcow2`); its result is recorded
|
||||||
|
in the follow-up if it completes.
|
||||||
- No AI provider credential is present; do not invent one.
|
- No AI provider credential is present; do not invent one.
|
||||||
- A real privileged `chown` (running as root) could not be exercised in this
|
- A real privileged `chown` (running as root) could not be exercised on this
|
||||||
unprivileged host; the ownership logic is verified through the injectable
|
unprivileged host; verified through the injectable fixer seam and the
|
||||||
fixer seam and the cross-uid refusal test. A root-run confirmation is a
|
cross-uid refusal test.
|
||||||
follow-up.
|
|
||||||
- **Public repo:** <https://git.phoebus.club/phoebus/phoebus_os>
|
- **Public repo:** <https://git.phoebus.club/phoebus/phoebus_os>
|
||||||
(remote `origin`, SSH port 2222).
|
(remote `origin`, SSH port 2222).
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -90,9 +90,12 @@ still not VM-verified.
|
||||||
| Per-step effect binding into the approval digest (contents + aggregate) | yes | yes (adversarial: step_effects swap rejected; legit multi-step validates) | no | n/a |
|
| Per-step effect binding into the approval digest (contents + aggregate) | yes | yes (adversarial: step_effects swap rejected; legit multi-step validates) | no | n/a |
|
||||||
| Stable approval identity (replay after presentation edit/reseal) | yes | yes (summary/other fields/identical id/concurrent/new-id) | no | n/a |
|
| Stable approval identity (replay after presentation edit/reseal) | yes | yes (summary/other fields/identical id/concurrent/new-id) | no | n/a |
|
||||||
| Live-safe monotonic recovery (owner liveness, immutable terminal) | yes | yes (live vs abandoned, reconcile/finish race) | no | n/a |
|
| Live-safe monotonic recovery (owner liveness, immutable terminal) | yes | yes (live vs abandoned, reconcile/finish race) | no | n/a |
|
||||||
| Personal preferences + alert state (user-owned, system-default precedence) | yes | yes (save/reload/isolation/precedence/failure) | no | no |
|
| Personal preferences + alert state (user-owned, system-default precedence) | yes | yes (save/reload/isolation/precedence/failure) | yes (installed VM: saved to user config, exit 0) | no |
|
||||||
| Personal write ownership (elevated chown, symlink refusal, cross-uid refusal) | yes | yes (ownership-fixer seam + CLI refusal) | no | no |
|
| Personal write ownership (elevated chown, symlink refusal, cross-uid refusal) | yes | yes (ownership-fixer seam + CLI refusal) | no | no |
|
||||||
| Transaction log (outcomes, protective snapshots) | yes | yes | no | no |
|
| Personal preference does not need the root-owned system transaction log | yes | yes (CLI regression: read-only transaction dir) | yes (installed VM acceptance) | n/a |
|
||||||
|
| Installed `sys` acceptance matrix (read-only/failure) | yes | yes | yes (installed VM: `PASS=24 FAIL=0`) | no |
|
||||||
|
| Privileged `--broker` plan execution + replay rejection in a VM | yes | yes (privileged entry point) | no (needs root/Polkit agent; unit-tested only) | n/a |
|
||||||
|
| Transaction log (outcomes, protective snapshots) | yes | yes | read-only in installed VM; write path needs root | no |
|
||||||
| Flatpak/Nix bounded typed actions | yes | yes | no | no |
|
| Flatpak/Nix bounded typed actions | yes | yes | no | no |
|
||||||
| Shared hardware-aware source selection (all lanes) | yes | yes | no | no |
|
| Shared hardware-aware source selection (all lanes) | yes | yes | no | no |
|
||||||
| Snap lane (detect/install/list/remove/refresh/connections) | yes | yes | no | no |
|
| Snap lane (detect/install/list/remove/refresh/connections) | yes | yes | no | no |
|
||||||
|
|
|
||||||
|
|
@ -144,13 +144,16 @@ pub fn install_sys_to_target(exec: &Exec) -> Result<PathBuf> {
|
||||||
)
|
)
|
||||||
})?;
|
})?;
|
||||||
|
|
||||||
// Verify execution inside target chroot: run harmless deterministic `sys history`
|
// Verify execution inside target chroot with the deterministic legacy
|
||||||
|
// interface: `sys history` without `--legacy` is AI-first and (correctly)
|
||||||
|
// refuses to run without a connected model, so the offline-safe probe must
|
||||||
|
// select `--legacy`.
|
||||||
let root = Path::new(&exec.root);
|
let root = Path::new(&exec.root);
|
||||||
portage::chroot(exec, root, "/usr/local/bin/sys", &["history"]).map_err(|e| {
|
portage::chroot(exec, root, "/usr/local/bin/sys", &["history", "--legacy"]).map_err(|e| {
|
||||||
ExecError::operation(
|
ExecError::operation(
|
||||||
"sys_runtime",
|
"sys_runtime",
|
||||||
"verify sys in chroot",
|
"verify sys in chroot",
|
||||||
format!("running sys history in target chroot failed: {e}"),
|
format!("running sys history --legacy in target chroot failed: {e}"),
|
||||||
)
|
)
|
||||||
})?;
|
})?;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -444,7 +444,11 @@ fn execute_action(
|
||||||
}
|
}
|
||||||
println!("{}", outcome.output);
|
println!("{}", outcome.output);
|
||||||
|
|
||||||
if action.is_mutating() {
|
// Only system-level mutations belong in the root-owned transaction history.
|
||||||
|
// A personal preference is user-owned state: recording it in
|
||||||
|
// `/var/lib/phoebus/transactions.toml` would fail for a normal account
|
||||||
|
// (permission denied) even though the preference was saved successfully.
|
||||||
|
if action.requires_root() {
|
||||||
let described = action.describe();
|
let described = action.describe();
|
||||||
let record = TransactionRecord {
|
let record = TransactionRecord {
|
||||||
id: 0,
|
id: 0,
|
||||||
|
|
|
||||||
|
|
@ -245,6 +245,47 @@ fn a_personal_preference_is_saved_by_a_normal_account_outside_etc() {
|
||||||
.exists());
|
.exists());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_personal_preference_does_not_require_the_root_owned_transaction_log() {
|
||||||
|
if effective_uid_is_root() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
use std::os::unix::fs::PermissionsExt;
|
||||||
|
let root = tempfile::tempdir().expect("temp root");
|
||||||
|
let personal = tempfile::tempdir().expect("personal dir");
|
||||||
|
// Simulate the installed system: /var/lib/phoebus is root-owned, so a normal
|
||||||
|
// account cannot write the system transaction log.
|
||||||
|
let tx_dir = root.path().join("var/lib/phoebus");
|
||||||
|
std::fs::create_dir_all(&tx_dir).expect("create tx dir");
|
||||||
|
std::fs::set_permissions(&tx_dir, std::fs::Permissions::from_mode(0o555)).expect("chmod");
|
||||||
|
|
||||||
|
let out = sys()
|
||||||
|
.arg("--root")
|
||||||
|
.arg(root.path())
|
||||||
|
.env("PHOEBUS_PERSONAL_DIR", personal.path())
|
||||||
|
.args([
|
||||||
|
"--legacy",
|
||||||
|
"--action",
|
||||||
|
r#"{"action":"set_package_preference","name":"firefox","backend":"flatpak"}"#,
|
||||||
|
])
|
||||||
|
.output()
|
||||||
|
.expect("run sys");
|
||||||
|
assert!(
|
||||||
|
out.status.success(),
|
||||||
|
"a personal preference must succeed without the system transaction log: {}",
|
||||||
|
String::from_utf8_lossy(&out.stderr)
|
||||||
|
);
|
||||||
|
// The preference was saved; no system transaction was attempted.
|
||||||
|
assert!(personal
|
||||||
|
.path()
|
||||||
|
.join(".config/phoebus/package-preferences.toml")
|
||||||
|
.is_file());
|
||||||
|
assert!(
|
||||||
|
!tx_dir.join("transactions.toml").exists(),
|
||||||
|
"no system transaction should be attempted for a personal preference"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn a_personal_preference_is_refused_when_the_initiating_uid_differs_from_the_euid() {
|
fn a_personal_preference_is_refused_when_the_initiating_uid_differs_from_the_euid() {
|
||||||
if effective_uid_is_root() {
|
if effective_uid_is_root() {
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue