Miles WardandClaude Opus 4.8
6524aa4118
Introspection (the headline): detection is now probe-based. Instead of
grepping raw sectors for filename strings, we walk the ISO9660
directory tree and check whether the well-known boot files actually
exist — and the same probes run over NFS READ3 / SFTP seek-reads, so
share-hosted ISOs finally classify instead of registering as Unknown.
iso-store:
- New iso_fs module: the read-only ISO9660 walker (generalized from
http-api) over an IsoReadAt trait — local files, NFS, SFTP, and the
in-memory test images all share it. Iterative walk, 4 MiB directory
cap, strict-mastering trailing-dot normalization (VMLINUZ.;1 now
matches /vmlinuz), CachingReadAt collapses repeated directory reads
during the probe pass (~60 → ~6 round-trips per remote ISO).
- introspect.rs rewritten (INTROSPECT_REV 2): PVD label → El Torito →
/sources/boot.wim probe → verified Linux kernel+initrd probe table →
local-only 16 MiB UDF-Windows scan → filename-token fallback.
* Fixes the false-Windows bug: any Linux ISO shipping GRUB/syslinux
chainload modules contains the literal "bootmgr", so gparted-live
classified as WindowsPe. Linux probes now run first; the byte scan
only sees ISOs nothing else claimed. Local ISOs re-probe once on
startup via the rev bump — no re-upload.
* Kernel entries are emitted only when kernel+initrd verifiably
exist (no more guessed paths that 404 at boot). Debian-live /
d-i netinst / CoreOS shapes classify for the UI but keep their
working sanboot entries (their boot protocols need args we don't
render yet; CoreOS additionally needs its embedded ignition).
* Label + filename vocab extended: rhcos/coreos/openshift/okd,
gparted/clonezilla/kali/tails, almalinux/rocky, sles, manjaro.
- NFS + SFTP managers: per-ISO IsoReadAt readers (READ3-at-offset with
short-read looping / seek+read_exact), background introspection pass
after each scan — entries register instantly with a provisional
filename-based report (rev 0, optimistic sanboot preserved) and
upgrade in place as probes land (30s/ISO timeout, failures keep the
provisional). locate_in_iso() exposes the walker to the HTTP layer.
- remote_cache: introspection results persisted per protocol keyed
share/path@size and gated on INTROSPECT_REV — container restarts
re-probe only new/replaced ISOs; upgrades re-probe exactly once.
- SMB: smbclient can't seek, so SMB ISOs get the filename-token family
(rev stays 0 → sanboot entry + "awaiting introspection" label).
- IsoStore::update_external_introspection swaps in completed reports
and regenerates boot entries, preserving category/password.
http-api:
- /iso/{id}/{*path} now serves files from inside NFS/SFTP-hosted ISOs
(remote ISO9660 lookup + ranged share stream) — verified kernel
entries on remote Linux ISOs are actually bootable, end to end.
- iso_fs.rs deleted in favor of the shared iso-store module.
- full_flow fixtures build real directory trees via the shared
test-image builder (new iso-store feature) — a label-only blob no
longer earns a kernel entry, by design.
webui:
- Available images: paged 5 per page with a quiet footer pager
(Showing X–Y of N · Prev/Next), filter-then-paginate, page resets on
search input. Fifty images is five clean pages, not a scroll wall.
- Hosts/Queue profile: "Unattended file (in Storage → Advanced)" so
the picker says where the files live.
- Row badge keys on introspect_rev: probed remote ISOs read like local
ones; un-probed say "awaiting introspection".
Validation: clippy pedantic clean, fmt clean, 316 workspace tests
green (+17: walker, probe shapes incl. gparted regression + CoreOS,
filename table, cache round-trips), webui syntax-checked.
Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]>
60 lines
2.1 KiB
TOML
60 lines
2.1 KiB
TOML
[package]
|
|
name = "openpxe-iso-store"
|
|
version.workspace = true
|
|
edition.workspace = true
|
|
license.workspace = true
|
|
authors.workspace = true
|
|
description = "ISO upload, storage, introspection, and boot-entry generation for OpenPXE"
|
|
|
|
[lints]
|
|
workspace = true
|
|
|
|
[dependencies]
|
|
openpxe-core.workspace = true
|
|
tokio = { workspace = true }
|
|
tokio-util = { workspace = true }
|
|
serde.workspace = true
|
|
serde_json.workspace = true
|
|
tracing.workspace = true
|
|
thiserror.workspace = true
|
|
anyhow.workspace = true
|
|
sha2.workspace = true
|
|
hex.workspace = true
|
|
bcrypt.workspace = true
|
|
uuid.workspace = true
|
|
time.workspace = true
|
|
parking_lot.workspace = true
|
|
bytes.workspace = true
|
|
tempfile = "3.12"
|
|
libc = "0.2"
|
|
# v0.4.61: server-side compose of the operator's uploaded raster into a
|
|
# fixed 1024x768 canvas so the PXE menu always gets a consistently-sized
|
|
# PNG regardless of what the operator uploaded. We use the bare-bones
|
|
# `image` crate (no default features) and explicitly enable only the
|
|
# decoders we accept on upload (PNG/JPEG/WebP/GIF) plus the PNG
|
|
# encoder. Keeps the build slim — no JPEG2000, TIFF, BMP, etc.
|
|
image = { version = "0.25", default-features = false, features = ["png", "jpeg", "webp", "gif"] }
|
|
|
|
# v0.4.67: pure-Rust NFSv3 client for reading remote ISOs without a
|
|
# kernel mount. See crates/iso-store/src/nfs_share.rs for usage.
|
|
nfs3_client = { workspace = true }
|
|
nfs3_types = { workspace = true }
|
|
# v0.5.5: pure-Rust SSH/SFTP client (ring backend) for the SFTP remote
|
|
# share path. See crates/iso-store/src/sftp_share.rs for usage.
|
|
russh = { workspace = true }
|
|
russh-sftp = { workspace = true }
|
|
# Needed for the Stream trait that wraps the mpsc receiver feeding
|
|
# NFS read-loop bytes into axum's Body::from_stream.
|
|
futures = { workspace = true }
|
|
|
|
[dev-dependencies]
|
|
tempfile = "3.12"
|
|
|
|
[features]
|
|
# v0.7.4: exposes the in-memory ISO9660 test-image builder
|
|
# (`iso_fs::testiso`) to other crates' integration tests, so http-api's
|
|
# full-flow tests can synthesize ISOs with real directory trees — the
|
|
# probe-based introspection no longer classifies label-only blobs.
|
|
# Never enabled in production builds.
|
|
test-image = []
|