Miles WardandClaude Opus 4.7
59bfdb3984
NFS is back — done right this time. v0.4.67 ships a pure-Rust NFSv3
client (`nfs3_client` 0.9 from the xetdata/Vaiz crate family) running
in-process inside the openpxe binary. No `mount.nfs`, no kernel
modules, no `CAP_SYS_ADMIN`, no subprocess. Works in every container
that the v0.4.65 SMB path works in (Unraid included).
The v0.4.65 SMB path stays as-is. Operators get both protocols
side-by-side and pick whichever their NAS prefers — or use both
together. NFSv3 has one architectural advantage over the SMB
userspace path: HTTP Range requests work for NFS-sourced ISOs
because NFSv3 READ3 takes an explicit offset. SMB-sourced ISOs still
return 416 for ranges (smbclient CLI can't seek mid-stream).
## What's new
- `crates/iso-store/src/nfs_share.rs` — `NfsShareManager` mirroring
`SmbShareManager` structurally. Lists ISOs via READDIR3+LOOKUP3+
GETATTR3, streams files via READ3 in 64 KiB chunks piped to axum
body streams. Uses `connect_from_privileged_port(false)` because
the openpxe binary runs as uid 10001 — most modern NFS servers
allow that; a server that demands privileged ports needs
`insecure` in /etc/exports, and the hint translation calls that
out specifically.
- `IsoSource::Nfs { share_id, relative_path }` variant alongside the
existing `Smb`. `IsoStore::iso_path_for` returns None for both;
the HTTP handler dispatches to the right share manager.
- `/api/nfs-shares` CRUD + scan endpoints, parallel to
`/api/smb-shares`. `POST` body: `{ server, export, port? }`.
- `nfs` terminal command back (this time as in-process, not kernel
mount): `list | add <srv>:<export> [port] | remove | scan`. The
v0.4.64 `nfs` command name pointing at kernel mount is moot
history — same name, completely different mechanism.
- Storage tab: a new NFS shares card sits directly below the SMB
shares card. The form is simpler (no auth fields) since NFSv3
uses AUTH_SYS and access is gated server-side by client IP.
- Dashboard "Images available" tile sums SMB + NFS reachable shares
into a generic "N remote shares" line.
## What's the same
- The structured `{error, stderr, hint}` JSON shape on failures
matches the SMB API exactly, so the UI's error banner renders
identically.
- Hint translation: NFS3ERR_ACCES → "exports list", NFS3ERR_NOENT →
"export path doesn't exist", `mount denied` → "/etc/exports may
need `insecure`", timeouts → "check IP/port/firewall".
- Persistence: `<work_dir>/nfs_shares.json`. No conflict with the
long-dead v0.4.64 `nfs.json`.
## Why nfs3_client
User picked it: pure-Rust matches the architecture, NFSv3 covers the
real-world cases, AUTH_SYS keeps the UI simple. The crate is at
0.9.0, MIT/Unlicense, rust-version 1.88 (we're on 1.95). Tokio
feature flag enabled. Image size unchanged at compile time — single
musl static binary, no extra OS packages.
## Tests
160 passing (was 150 in v0.4.66, +10):
- nfs_share parser: stable share ids, server normalization (smb://,
cifs://, \\, // all stripped).
- hint_for(): NFS3ERR_ACCES, NFS3ERR_NOENT, mount denied, unknown.
- status_label() covers the common nfsstat3 codes.
- HTTP integration: nfs-shares list starts empty, missing server
rejected, export without leading slash rejected.
`cargo clippy --workspace --all-targets -- -D warnings` clean.
Co-Authored-By: Claude Opus 4.7 (1M context) <[email protected]>
83 lines
4.1 KiB
Rust
83 lines
4.1 KiB
Rust
use crate::uploads::UploadSessions;
|
|
use crate::auth::SessionStore;
|
|
use openpxe_core::{
|
|
AdminStore, BootLog, BrandingStore, ClientRegistry, DeploymentQueue, HostBindings, LogBus,
|
|
Metrics, SettingsStore, SsoStore,
|
|
};
|
|
use openpxe_iso_store::{IsoStore, NfsShareManager, SmbManager, SmbShareManager};
|
|
use std::sync::Arc;
|
|
use time::OffsetDateTime;
|
|
|
|
#[derive(Clone)]
|
|
pub struct AppState {
|
|
pub iso_store: IsoStore,
|
|
pub clients: Arc<ClientRegistry>,
|
|
pub settings: Arc<SettingsStore>,
|
|
pub queue: Arc<DeploymentQueue>,
|
|
/// Per-MAC iPXE script overrides. When a client matching one of
|
|
/// these MACs requests `/boot.ipxe`, we chain straight to the
|
|
/// configured target instead of rendering the menu.
|
|
pub hosts: HostBindings,
|
|
/// Persistent boot-event log surfaced under the Hosts tab. Records
|
|
/// every `/boot/<entry>.ipxe` chain that goes on to serve a script
|
|
/// (i.e. an image actually starting to install on a machine).
|
|
pub boot_log: BootLog,
|
|
/// Operator-controlled UI overrides (custom logo). When the
|
|
/// operator hasn't uploaded anything, the WebUI serves the bundled
|
|
/// rainbow-horizon mark.
|
|
pub branding: BrandingStore,
|
|
/// Forms-auth admin record + first-run bootstrap state. When
|
|
/// `admin.is_configured() == false`, the auth middleware passes
|
|
/// every request through and `/api/me` reports `setup_required`.
|
|
pub admin: AdminStore,
|
|
/// In-memory session table for active operator logins. Cleared on
|
|
/// process restart (sessions are tied to UI state, not persisted —
|
|
/// matches Sonarr/Radarr behaviour).
|
|
pub sessions: SessionStore,
|
|
/// SAML SSO configuration. v0.4.5 stores it; the actual SSO login
|
|
/// flow ships in a later release.
|
|
pub sso: SsoStore,
|
|
/// Lock-free metrics counters surfaced at `/metrics` in Prometheus
|
|
/// text format. Cheap to clone (handles to atomics).
|
|
pub metrics: Metrics,
|
|
/// Optional SMB manager. Present when the binary was given a writable
|
|
/// `smb_dir` at startup; `None` in pure-Linux-only deployments where
|
|
/// Windows support is not wired in. Settings toggle drives start/stop.
|
|
pub smb: Option<Arc<SmbManager>>,
|
|
/// v0.4.65: SMB share manager — userspace consumer of remote SMB
|
|
/// shares via Samba's `smbclient` CLI. Replaces the kernel-mount
|
|
/// NFS path that v0.4.64 shipped; that path didn't work on hosts
|
|
/// (Unraid, etc.) whose kernel ships without the nfs/cifs client
|
|
/// modules, and no container-side configuration could fix it.
|
|
/// `smbclient` does the SMB protocol over a plain TCP socket in
|
|
/// userspace — works in any container, no special caps required.
|
|
pub smb_shares: SmbShareManager,
|
|
/// v0.4.67: NFSv3 share manager — pure-Rust userspace consumer
|
|
/// via the `nfs3_client` crate. Ships alongside the SMB manager
|
|
/// so operators pick whichever protocol their NAS prefers.
|
|
/// In-process (no subprocess); supports HTTP Range requests on
|
|
/// NFS-sourced ISOs because NFSv3 READ3 takes an explicit offset.
|
|
pub nfs_shares: NfsShareManager,
|
|
/// Browser chunked upload state. Multipart uploads still go straight
|
|
/// through `IsoStore`, but the UI uses sessions so large ISO transfers
|
|
/// can show deterministic progress and leave visible partial files.
|
|
pub uploads: UploadSessions,
|
|
/// Live log bus consumed by the Terminal tab via SSE. Operator-issued
|
|
/// terminal commands also push synthetic lines onto it so the tail
|
|
/// shows them inline.
|
|
pub log_bus: Arc<LogBus>,
|
|
/// Wall-clock instant the server bound — used for the uptime chip.
|
|
pub started_at: OffsetDateTime,
|
|
/// Base URL advertised to PXE clients (e.g. `http://10.0.0.5`). Used when
|
|
/// rendering iPXE scripts so every URL resolves offline.
|
|
pub public_base_url: String,
|
|
/// Name of the network interface auto-detected at startup (e.g.
|
|
/// `enp1s0`). Surfaced read-only on the Network tab. Empty if the
|
|
/// interface couldn't be identified.
|
|
pub nic_name: String,
|
|
/// Subnet mask of the public interface in dotted-quad form.
|
|
pub subnet_mask: String,
|
|
/// Default gateway IPv4 address.
|
|
pub gateway: String,
|
|
}
|