diff --git a/docs/HANDOFF.md b/docs/HANDOFF.md index 7d395c8..5091065 100644 --- a/docs/HANDOFF.md +++ b/docs/HANDOFF.md @@ -44,8 +44,8 @@ commit it. It should be short and current; use `git log` for detail. active redactor, 0600/0700 atomic writes, bounded to ten turns, clearable. - **Last verified (this session):** - `cargo fmt --all -- --check` clean. - - `cargo test --workspace` all pass (67 phoebus-installer, 173 phoebus-core, - 195 phoebus-executor, plus integration/CLI suites). + - `cargo test --workspace` all pass (70 phoebus-installer unit, 173 + phoebus-core, 195 phoebus-executor, 26 CLI, plus integration suites). - `cargo clippy --workspace --all-targets` runs (exit 0; pre-existing `result_large_err`/arg-count lints remain, as at the reviewed commit). - `make test` passes (Rust workspace + VM disk-safety suite). diff --git a/installer-rs/crates/phoebus-installer/src/ai_setup.rs b/installer-rs/crates/phoebus-installer/src/ai_setup.rs index 2d8fd4c..70c8779 100644 --- a/installer-rs/crates/phoebus-installer/src/ai_setup.rs +++ b/installer-rs/crates/phoebus-installer/src/ai_setup.rs @@ -261,3 +261,86 @@ impl ResolvedAi { } } } + +#[cfg(test)] +mod tests { + use super::*; + use phoebus_core::Redactor; + use phoebus_executor::command::RecordingRunner; + use phoebus_executor::Logger; + + fn make_exec() -> Exec { + let path = tempfile::tempdir().unwrap().keep(); + let logger = Logger::open(path.join("l.log"), Redactor::new(), false); + Exec::new( + Box::new(RecordingRunner::new()), + logger, + false, + path.join("root"), + path, + ) + } + + fn resolved(provider: ProviderKind, key_file: Option) -> ResolvedAi { + ResolvedAi { + backend: AiBackend::Direct, + provider, + endpoint: "https://example.invalid/v1/chat/completions".into(), + model: "m".into(), + opencode_server: String::new(), + opencode_provider: String::new(), + opencode_model: String::new(), + api_key_file: key_file, + opencode_password_file: None, + no_sandbox: true, + } + } + + #[test] + fn credential_loads_from_a_0600_file_and_is_redacted() { + use std::os::unix::fs::PermissionsExt; + let dir = tempfile::tempdir().unwrap(); + let key = dir.path().join("ai.key"); + std::fs::write(&key, "sk-synthetic-secret\n").unwrap(); + std::fs::set_permissions(&key, std::fs::Permissions::from_mode(0o600)).unwrap(); + let exec = make_exec(); + + let resolved = resolved(ProviderKind::DeepSeek, Some(key)); + let secret = resolved.load_direct_key(&exec).unwrap().unwrap(); + assert_eq!(secret.expose(), "sk-synthetic-secret"); + // Registered with the process redactor, so it cannot be logged. + assert_eq!( + exec.redactor().redact("bearer sk-synthetic-secret"), + "bearer " + ); + // A transport can be built without the key touching argv or QML. + assert!(resolved.transport(&exec).is_ok()); + } + + #[test] + fn an_inaccessible_credential_is_reported_clearly() { + use std::os::unix::fs::PermissionsExt; + let dir = tempfile::tempdir().unwrap(); + let key = dir.path().join("ai.key"); + std::fs::write(&key, "wide-open\n").unwrap(); + std::fs::set_permissions(&key, std::fs::Permissions::from_mode(0o644)).unwrap(); + let exec = make_exec(); + + let resolved = resolved(ProviderKind::DeepSeek, Some(key)); + let err = resolved.load_direct_key(&exec).unwrap_err().to_string(); + assert!(err.contains("could not load the provider API key"), "{err}"); + } + + #[test] + fn a_keyed_provider_without_a_credential_fails_closed() { + let exec = make_exec(); + let err = resolved(ProviderKind::DeepSeek, None) + .transport(&exec) + .err() + .expect("a keyed provider without a credential must fail") + .to_string(); + assert!(err.contains("requires an API key"), "{err}"); + // A local model needs no key. + assert!(resolved(ProviderKind::Local, None).transport(&exec).is_ok()); + } +} diff --git a/installer-rs/crates/phoebus-installer/tests/sys_cli.rs b/installer-rs/crates/phoebus-installer/tests/sys_cli.rs index fed4412..dc6a33f 100644 --- a/installer-rs/crates/phoebus-installer/tests/sys_cli.rs +++ b/installer-rs/crates/phoebus-installer/tests/sys_cli.rs @@ -468,3 +468,51 @@ fn broker_execute_plan_rejects_missing_file() { .expect("run sys"); assert!(!out.status.success()); } + +#[test] +fn default_install_without_a_model_stops_and_offers_legacy() { + let root = tempfile::tempdir().expect("temp root"); + let plans = tempfile::tempdir().expect("plans"); + let out = sys() + .arg("--root") + .arg(root.path()) + .env("PHOEBUS_AI_PROVIDER", "") + .env("PHOEBUS_AI_API_KEY_FILE", "") + .env("PHOEBUS_PLANS_DIR", plans.path()) + .args(["install", "firefox"]) + .output() + .expect("run sys"); + assert!(!out.status.success()); + let stderr = String::from_utf8_lossy(&out.stderr); + assert!(stderr.contains("legacy"), "stderr: {stderr}"); + assert!(!stderr.contains("installed firefox"), "stderr: {stderr}"); +} + +#[test] +fn default_removal_without_a_model_stops_and_offers_legacy() { + let root = tempfile::tempdir().expect("temp root"); + let plans = tempfile::tempdir().expect("plans"); + let out = sys() + .arg("--root") + .arg(root.path()) + .env("PHOEBUS_AI_PROVIDER", "") + .env("PHOEBUS_AI_API_KEY_FILE", "") + .env("PHOEBUS_PLANS_DIR", plans.path()) + .args(["remove", "firefox"]) + .output() + .expect("run sys"); + assert!(!out.status.success()); + let stderr = String::from_utf8_lossy(&out.stderr); + assert!(stderr.contains("legacy"), "stderr: {stderr}"); +} + +#[test] +fn broker_execute_plan_requires_a_plan_uid() { + // Even a valid-looking id is refused without the initiating uid; the + // broker never falls back to an arbitrary path or to `/`. + let out = sys() + .args(["--broker", "--execute-plan", "plan-inst-deadbeef"]) + .output() + .expect("run sys"); + assert!(!out.status.success()); +}