test(appd): launch complete packages in the supervisor tests

Launch tests wrote manifests without names, versions or entries, which
the shared parser rejects. They now write complete packages.
This commit is contained in:
Marco Allegretti 2026-10-09 10:18:36 +00:00
parent 2148ffc8ae
commit d056045ad8
No known key found for this signature in database
9 changed files with 107 additions and 55 deletions

2
Cargo.lock generated
View file

@ -10455,10 +10455,8 @@ version = "0.1.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bitflags 2.11.0", "bitflags 2.11.0",
"serde",
"servo", "servo",
"softbuffer", "softbuffer",
"toml 0.8.23",
"tracing", "tracing",
"tracing-subscriber", "tracing-subscriber",
"wayland-backend", "wayland-backend",

View file

@ -628,7 +628,12 @@ fn resolve_weft_system_url(url: &ServoUrl) -> Option<ServoUrl> {
/// Shows the UI document `ui` of `app_id`, the file weft-appd resolved from /// Shows the UI document `ui` of `app_id`, the file weft-appd resolved from
/// the package; the shell never looks for the package itself. /// the package; the shell never looks for the package itself.
pub fn run(app_id: &str, session_id: u64, ws_port: u16, ui: &std::path::Path) -> anyhow::Result<()> { pub fn run(
app_id: &str,
session_id: u64,
ws_port: u16,
ui: &std::path::Path,
) -> anyhow::Result<()> {
let url = ServoUrl::from_file_path(ui) let url = ServoUrl::from_file_path(ui)
.map_err(|()| anyhow::anyhow!("{} is not an absolute path", ui.display()))?; .map_err(|()| anyhow::anyhow!("{} is not an absolute path", ui.display()))?;
tracing::info!(%app_id, %url, "showing application UI"); tracing::info!(%app_id, %url, "showing application UI");

View file

@ -48,14 +48,13 @@ pub(crate) fn resolve(app_id: &str) -> Result<LaunchPackage, Refusal> {
return from_root(app_id, dir, None); return from_root(app_id, dir, None);
} }
} }
Err(Refusal::new(404, format!("package {app_id} is not installed"))) Err(Refusal::new(
404,
format!("package {app_id} is not installed"),
))
} }
fn from_root( fn from_root(app_id: &str, root: PathBuf, image: Option<Mount>) -> Result<LaunchPackage, Refusal> {
app_id: &str,
root: PathBuf,
image: Option<Mount>,
) -> Result<LaunchPackage, Refusal> {
let manifest = Manifest::read(&root).map_err(|e| Refusal::new(403, e.to_string()))?; let manifest = Manifest::read(&root).map_err(|e| Refusal::new(403, e.to_string()))?;
if manifest.package.id != app_id { if manifest.package.id != app_id {
return Err(Refusal::new( return Err(Refusal::new(
@ -112,10 +111,8 @@ mod tests {
/// A store holding a directory install of `ID`, with WEFT_APP_STORE /// A store holding a directory install of `ID`, with WEFT_APP_STORE
/// pointing at it. Callers hold env_lock. /// pointing at it. Callers hold env_lock.
fn store(name: &str, manifest_id: &str, module: &str) -> PathBuf { fn store(name: &str, manifest_id: &str, module: &str) -> PathBuf {
let store = std::env::temp_dir().join(format!( let store =
"weft_appd_launch_{name}_{}", std::env::temp_dir().join(format!("weft_appd_launch_{name}_{}", std::process::id()));
std::process::id()
));
let _ = std::fs::remove_dir_all(&store); let _ = std::fs::remove_dir_all(&store);
let package = store.join(ID); let package = store.join(ID);
std::fs::create_dir_all(package.join("ui")).unwrap(); std::fs::create_dir_all(package.join("ui")).unwrap();
@ -172,7 +169,11 @@ mod tests {
let refused = refusal(resolve(ID)); let refused = refusal(resolve(ID));
finish(&store); finish(&store);
assert_eq!(refused.code, 403); assert_eq!(refused.code, 403);
assert!(refused.message.contains("org.weft.test.other"), "{}", refused.message); assert!(
refused.message.contains("org.weft.test.other"),
"{}",
refused.message
);
} }
#[test] #[test]
@ -183,7 +184,11 @@ mod tests {
let refused = refusal(resolve(ID)); let refused = refusal(resolve(ID));
finish(&store); finish(&store);
assert_eq!(refused.code, 403); assert_eq!(refused.code, 403);
assert!(refused.message.contains("runtime.module"), "{}", refused.message); assert!(
refused.message.contains("runtime.module"),
"{}",
refused.message
);
} }
#[test] #[test]
@ -233,7 +238,11 @@ mod tests {
for refused in [&partial, &failed, &absent, &malformed] { for refused in [&partial, &failed, &absent, &malformed] {
assert_eq!(refused.code, 500, "{}", refused.message); assert_eq!(refused.code, 500, "{}", refused.message);
assert!(refused.message.contains("verified image"), "{}", refused.message); assert!(
refused.message.contains("verified image"),
"{}",
refused.message
);
} }
assert!(partial.message.contains(".app.hash"), "{}", partial.message); assert!(partial.message.contains(".app.hash"), "{}", partial.message);
assert_eq!(mountpoints, 0, "a failed mount left its mountpoint behind"); assert_eq!(mountpoints, 0, "a failed mount left its mountpoint behind");

View file

@ -597,7 +597,12 @@ async fn resolve_launch(
Ok((package, grants)) Ok((package, grants))
}) })
.await .await
.unwrap_or_else(|e| Err(grants::Refusal::new(500, format!("package resolution failed: {e}")))) .unwrap_or_else(|e| {
Err(grants::Refusal::new(
500,
format!("package resolution failed: {e}"),
))
})
} }
pub(crate) fn app_store_roots() -> Vec<std::path::PathBuf> { pub(crate) fn app_store_roots() -> Vec<std::path::PathBuf> {
@ -688,6 +693,22 @@ mod tests {
ENV_LOCK.get_or_init(|| tokio::sync::Mutex::new(())) ENV_LOCK.get_or_init(|| tokio::sync::Mutex::new(()))
} }
/// Writes a complete package `id` into `dir`; `extra` adds lines to its
/// `[package]` table.
fn write_test_package(dir: &std::path::Path, id: &str, extra: &str) {
std::fs::create_dir_all(dir.join("ui")).unwrap();
std::fs::write(dir.join("app.wasm"), b"\0asm\x01\0\0\0").unwrap();
std::fs::write(dir.join("ui/index.html"), b"<p>").unwrap();
std::fs::write(
dir.join("wapp.toml"),
format!(
"[package]\nid = \"{id}\"\nname = \"T\"\nversion = \"0.1.0\"\n{extra}\n\
[runtime]\nmodule = \"app.wasm\"\n[ui]\nentry = \"ui/index.html\"\n"
),
)
.unwrap();
}
fn make_registry() -> Registry { fn make_registry() -> Registry {
Arc::new(Mutex::new(SessionRegistry::default())) Arc::new(Mutex::new(SessionRegistry::default()))
} }
@ -762,12 +783,11 @@ mod tests {
let _env = env_lock().lock().await; let _env = env_lock().lock().await;
let store = std::env::temp_dir().join(format!("weft_refuse_{}", std::process::id())); let store = std::env::temp_dir().join(format!("weft_refuse_{}", std::process::id()));
let app_dir = store.join("org.example.gpu"); let app_dir = store.join("org.example.gpu");
std::fs::create_dir_all(&app_dir).unwrap(); write_test_package(
std::fs::write( &app_dir,
app_dir.join("wapp.toml"), "org.example.gpu",
"[package]\nid = \"org.example.gpu\"\ncapabilities = [\"hw:gpu:compute\"]\n", "capabilities = [\"hw:gpu:compute\"]",
) );
.unwrap();
let prior_store = std::env::var("WEFT_APP_STORE").ok(); let prior_store = std::env::var("WEFT_APP_STORE").ok();
let prior_bin = std::env::var("WEFT_RUNTIME_BIN").ok(); let prior_bin = std::env::var("WEFT_RUNTIME_BIN").ok();
// SAFETY: env_lock is held and the runtime is current_thread. // SAFETY: env_lock is held and the runtime is current_thread.
@ -1163,12 +1183,7 @@ mod tests {
use_test_runtime_dir(); use_test_runtime_dir();
let dir = std::env::temp_dir().join(format!("weft_test_relay_{}", std::process::id())); let dir = std::env::temp_dir().join(format!("weft_test_relay_{}", std::process::id()));
let app = dir.join("store/org.example.relay"); let app = dir.join("store/org.example.relay");
std::fs::create_dir_all(&app).unwrap(); write_test_package(&app, "org.example.relay", "");
std::fs::write(
app.join("wapp.toml"),
"[package]\nid = \"org.example.relay\"\n",
)
.unwrap();
// The runtime reports ready and exits without connecting to the relay. // The runtime reports ready and exits without connecting to the relay.
let child = dir.join("child.sh"); let child = dir.join("child.sh");
std::fs::write( std::fs::write(
@ -1559,7 +1574,7 @@ mod tests {
std::time::Duration::from_secs(20), std::time::Duration::from_secs(20),
runtime::supervise( runtime::supervise(
session_id, session_id,
"test.app", launch::LaunchPackage::unresolved("test.app"),
grants::SessionGrants::default(), grants::SessionGrants::default(),
Arc::clone(&registry), Arc::clone(&registry),
abort_rx, abort_rx,

View file

@ -56,7 +56,10 @@ pub(crate) fn mount(app_id: &str, files: &ImageFiles) -> Result<Mount, String> {
for path in [&files.image, &files.hash_tree, &files.root_hash] { for path in [&files.image, &files.hash_tree, &files.root_hash] {
let is_file = std::fs::symlink_metadata(path).is_ok_and(|m| m.file_type().is_file()); let is_file = std::fs::symlink_metadata(path).is_ok_and(|m| m.file_type().is_file());
if !is_file { if !is_file {
return Err(format!("{} is missing or not a regular file", path.display())); return Err(format!(
"{} is missing or not a regular file",
path.display()
));
} }
} }
let root_hash = std::fs::read_to_string(&files.root_hash) let root_hash = std::fs::read_to_string(&files.root_hash)
@ -99,7 +102,7 @@ pub(crate) fn mount(app_id: &str, files: &ImageFiles) -> Result<Mount, String> {
/// A dm-verity root hash in hex, as `veritysetup format` prints it. /// A dm-verity root hash in hex, as `veritysetup format` prints it.
fn is_root_hash(text: &str) -> bool { fn is_root_hash(text: &str) -> bool {
(64..=128).contains(&text.len()) (64..=128).contains(&text.len())
&& text.len() % 2 == 0 && text.len().is_multiple_of(2)
&& text.bytes().all(|b| b.is_ascii_hexdigit()) && text.bytes().all(|b| b.is_ascii_hexdigit())
} }
@ -111,7 +114,13 @@ mod tests {
fn root_hashes_are_hex_digests() { fn root_hashes_are_hex_digests() {
assert!(is_root_hash(&"a".repeat(64))); assert!(is_root_hash(&"a".repeat(64)));
assert!(is_root_hash(&"0F".repeat(64))); assert!(is_root_hash(&"0F".repeat(64)));
for bad in ["", "abc", &"g".repeat(64), &"a".repeat(65), &"a".repeat(130)] { for bad in [
"",
"abc",
&"g".repeat(64),
&"a".repeat(65),
&"a".repeat(130),
] {
assert!(!is_root_hash(bad), "{bad:?}"); assert!(!is_root_hash(bad), "{bad:?}");
} }
} }

View file

@ -6,9 +6,9 @@ use weft_ipc_types::AppdToCompositor;
use crate::Registry; use crate::Registry;
use crate::compositor_client::CompositorSender; use crate::compositor_client::CompositorSender;
use crate::ipc::{AppStateKind, Response};
use crate::launch::LaunchPackage; use crate::launch::LaunchPackage;
use crate::mount::Mount; use crate::mount::Mount;
use crate::ipc::{AppStateKind, Response};
/// The per-session relay between the component's IPC socket and the app /// The per-session relay between the component's IPC socket and the app
/// bridge. It belongs to the session: closing it stops the relay task and /// bridge. It belongs to the session: closing it stops the relay task and
@ -378,15 +378,15 @@ pub(crate) async fn supervise(
tokio::spawn(drain_stdout(runtime_stdout, session_id)); tokio::spawn(drain_stdout(runtime_stdout, session_id));
let bridge_token = registry.lock().await.bridge_token(session_id); let bridge_token = registry.lock().await.bridge_token(session_id);
let mut app_shell = match spawn_app_shell(&shell_bin, session_id, &package, &token, bridge_token) let mut app_shell =
{ match spawn_app_shell(&shell_bin, session_id, &package, &token, bridge_token) {
Ok(child) => child, Ok(child) => child,
Err(e) => { Err(e) => {
return session return session
.settle(&registry, &format!("failed to spawn app shell: {e}")) .settle(&registry, &format!("failed to spawn app shell: {e}"))
.await; .await;
} }
}; };
let shell_stdout = app_shell.stdout.take().expect("stdout piped"); let shell_stdout = app_shell.stdout.take().expect("stdout piped");
tokio::spawn(drain_stderr( tokio::spawn(drain_stderr(
app_shell.stderr.take().expect("stderr piped"), app_shell.stderr.take().expect("stderr piped"),

View file

@ -62,7 +62,8 @@ impl Manifest {
/// Reads `<package_root>/wapp.toml`. /// Reads `<package_root>/wapp.toml`.
pub fn read(package_root: &Path) -> Result<Self, ManifestError> { pub fn read(package_root: &Path) -> Result<Self, ManifestError> {
let path = package_root.join(MANIFEST_FILE); let path = package_root.join(MANIFEST_FILE);
let text = std::fs::read_to_string(&path).map_err(|e| ManifestError::Io(path.clone(), e))?; let text =
std::fs::read_to_string(&path).map_err(|e| ManifestError::Io(path.clone(), e))?;
toml::from_str(&text).map_err(|e| ManifestError::Parse(path, e)) toml::from_str(&text).map_err(|e| ManifestError::Parse(path, e))
} }
@ -112,8 +113,8 @@ pub fn entry_path(package_root: &Path, entry: &str) -> Result<PathBuf, EntryErro
let mut path = package_root.to_path_buf(); let mut path = package_root.to_path_buf();
while let Some(component) = components.next() { while let Some(component) = components.next() {
path.push(component); path.push(component);
let metadata = std::fs::symlink_metadata(&path) let metadata =
.map_err(|_| EntryError::NotAFile(entry.to_owned()))?; std::fs::symlink_metadata(&path).map_err(|_| EntryError::NotAFile(entry.to_owned()))?;
if metadata.file_type().is_symlink() { if metadata.file_type().is_symlink() {
return Err(EntryError::Link(entry.to_owned())); return Err(EntryError::Link(entry.to_owned()));
} }
@ -130,10 +131,7 @@ mod tests {
use super::*; use super::*;
fn package(name: &str) -> PathBuf { fn package(name: &str) -> PathBuf {
let dir = std::env::temp_dir().join(format!( let dir = std::env::temp_dir().join(format!("weft_manifest_{name}_{}", std::process::id()));
"weft_manifest_{name}_{}",
std::process::id()
));
let _ = std::fs::remove_dir_all(&dir); let _ = std::fs::remove_dir_all(&dir);
std::fs::create_dir_all(dir.join("ui")).unwrap(); std::fs::create_dir_all(dir.join("ui")).unwrap();
std::fs::write(dir.join("app.wasm"), b"\0asm").unwrap(); std::fs::write(dir.join("app.wasm"), b"\0asm").unwrap();
@ -155,7 +153,13 @@ mod tests {
#[test] #[test]
fn entries_must_stay_inside_the_package() { fn entries_must_stay_inside_the_package() {
let dir = package("contained"); let dir = package("contained");
for entry in ["", "/etc/passwd", "../app.wasm", "ui/../app.wasm", "./app.wasm"] { for entry in [
"",
"/etc/passwd",
"../app.wasm",
"ui/../app.wasm",
"./app.wasm",
] {
assert_eq!( assert_eq!(
entry_path(&dir, entry), entry_path(&dir, entry),
Err(EntryError::NotContained(entry.to_owned())), Err(EntryError::NotContained(entry.to_owned())),

View file

@ -219,7 +219,10 @@ mod tests {
fn image_companions_share_the_image_name() { fn image_companions_share_the_image_name() {
let files = ImageFiles::in_store(Path::new("/store"), "org.weft.demo.notes"); let files = ImageFiles::in_store(Path::new("/store"), "org.weft.demo.notes");
assert_eq!(files.image, Path::new("/store/org.weft.demo.notes.app.img")); assert_eq!(files.image, Path::new("/store/org.weft.demo.notes.app.img"));
assert_eq!(files.hash_tree, Path::new("/store/org.weft.demo.notes.app.hash")); assert_eq!(
files.hash_tree,
Path::new("/store/org.weft.demo.notes.app.hash")
);
assert_eq!( assert_eq!(
files.root_hash, files.root_hash,
Path::new("/store/org.weft.demo.notes.app.roothash") Path::new("/store/org.weft.demo.notes.app.roothash")

View file

@ -1275,7 +1275,10 @@ entry = "ui/index.html"
std::fs::write(tmp.with_extension("wasm"), b"\0asm\x01\0\0\0").unwrap(); std::fs::write(tmp.with_extension("wasm"), b"\0asm\x01\0\0\0").unwrap();
std::os::unix::fs::symlink("index.html", tmp.join("ui/linked.html")).unwrap(); std::os::unix::fs::symlink("index.html", tmp.join("ui/linked.html")).unwrap();
let manifest = std::fs::read_to_string(tmp.join("wapp.toml")).unwrap(); let manifest = std::fs::read_to_string(tmp.join("wapp.toml")).unwrap();
let escaping = format!("../{}", tmp.with_extension("wasm").file_name().unwrap().display()); let escaping = format!(
"../{}",
tmp.with_extension("wasm").file_name().unwrap().display()
);
std::fs::write( std::fs::write(
tmp.join("wapp.toml"), tmp.join("wapp.toml"),
manifest manifest
@ -1286,8 +1289,14 @@ entry = "ui/index.html"
let msg = check_package(&tmp).unwrap_err().to_string(); let msg = check_package(&tmp).unwrap_err().to_string();
let _ = std::fs::remove_dir_all(&tmp); let _ = std::fs::remove_dir_all(&tmp);
let _ = std::fs::remove_file(tmp.with_extension("wasm")); let _ = std::fs::remove_file(tmp.with_extension("wasm"));
assert!(msg.contains("runtime.module") && msg.contains("not a relative path"), "{msg}"); assert!(
assert!(msg.contains("ui.entry") && msg.contains("symbolic link"), "{msg}"); msg.contains("runtime.module") && msg.contains("not a relative path"),
"{msg}"
);
assert!(
msg.contains("ui.entry") && msg.contains("symbolic link"),
"{msg}"
);
} }
#[test] #[test]