enricobuehler
571e22bc0f
Per plan §2.5: the security-critical rustls fingerprint-pinning ServerCertVerifier was hand-rolled three times — quic/endpoint.rs (PinVerify), pf-client-core library.rs, punktfunk-tray status.rs — drifting copies on a trust boundary. Add one canonical punktfunk_core::tls::PinVerify (+ cert_fingerprint) behind a light `tls` feature (rustls + sha2 only, no QUIC runtime); `quic` now depends on it, and quic::endpoint re-exports cert_fingerprint so that path stays byte-stable (gamestream + pf-client-core reach it there). - core::tls::PinVerify: new(pin) for the HTTP clients, with_observed(pin, slot) for the QUIC TOFU connect. Behavior-identical to all three originals (pin-check + real CertificateVerify signature verification; only hashes the leaf when a pin or observed slot needs it). Two focused unit tests anchor the boundary. - quic/endpoint.rs: drop the private PinVerify, wire client_pinned through tls::PinVerify::with_observed. - pf-client-core library.rs + tray status.rs: use the shared verifier; tray also routes load_pin through core cert_fingerprint and drops its direct sha2 dep, gaining only the light core `tls` feature (still no host dep, no QUIC runtime). Verified on Linux (home-worker-5): clippy 0/0 for core(quic), core(tls), pf-client-core, tray, host(nvenc,vulkan-encode,pyrowave); core 153 lib tests + loopback 7/7 (pinned handshake) + c_abi round-trip green. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
61 lines
2.9 KiB
TOML
61 lines
2.9 KiB
TOML
[package]
|
|
name = "punktfunk-tray"
|
|
description = "System-tray status icon for the punktfunk streaming host (Windows notification area / Linux StatusNotifierItem)"
|
|
version.workspace = true
|
|
edition.workspace = true
|
|
rust-version.workspace = true
|
|
license.workspace = true
|
|
authors.workspace = true
|
|
repository.workspace = true
|
|
|
|
[[bin]]
|
|
name = "punktfunk-tray"
|
|
path = "src/main.rs"
|
|
|
|
# Deliberately does NOT depend on punktfunk-host: the tray needs only the service name, the mgmt
|
|
# port, and the summary JSON shape — a dependency would drag the whole host (FFmpeg, PipeWire, …)
|
|
# into a 2 MB helper and make it un-buildable standalone. Non-Windows/non-Linux targets build a
|
|
# stub main (same pattern as the platform-gated clients).
|
|
[dependencies]
|
|
anyhow = "1"
|
|
|
|
[target.'cfg(any(windows, target_os = "linux"))'.dependencies]
|
|
serde = { version = "1", features = ["derive"] }
|
|
serde_json = "1"
|
|
# Loopback HTTPS poll of GET /api/v1/local/summary. Same sync ureq + rustls(ring) stack and
|
|
# custom-verifier pattern as the Linux client's library fetch (crates/pf-client-core/src/library.rs) —
|
|
# but ring-only (no default aws-lc-rs provider: it needs a C toolchain per target and the agent
|
|
# pins the ring provider explicitly anyway).
|
|
ureq = { version = "2", default-features = false, features = ["tls"] }
|
|
rustls = { version = "0.23", default-features = false, features = ["ring", "logging", "std", "tls12"] }
|
|
# The one shared cert-fingerprint pin verifier (`punktfunk_core::tls::PinVerify`) + fingerprint
|
|
# hash, instead of the tray hand-rolling its own copy on a trust boundary. The light `tls` feature
|
|
# is rustls + sha2 only (no QUIC runtime / tokio), so this stays a lean helper; core is a pure-Rust
|
|
# leaf (no C toolchain), unlike the host dependency ruled out above.
|
|
punktfunk-core = { path = "../punktfunk-core", default-features = false, features = ["tls"] }
|
|
|
|
[target.'cfg(windows)'.dependencies]
|
|
# SCM QUERY_STATUS works unprivileged — the service-state probe. Same crate the host service uses.
|
|
windows-service = "0.7"
|
|
windows = { version = "0.62", features = [
|
|
"Win32_Foundation",
|
|
"Win32_Graphics_Gdi",
|
|
"Win32_Security", # CreateMutexW's SECURITY_ATTRIBUTES parameter type
|
|
"Win32_System_LibraryLoader",
|
|
"Win32_System_Threading",
|
|
"Win32_UI_Shell",
|
|
"Win32_UI_WindowsAndMessaging",
|
|
] }
|
|
|
|
[target.'cfg(target_os = "linux")'.dependencies]
|
|
# StatusNotifierItem (pure Rust, zbus — the same zbus the host already pulls via ashpd). The tray
|
|
# is a plain-threads poller, so the blocking API over the small async-io executor (`blocking`
|
|
# alone is just the wrapper — zbus still needs an executor; no tokio runtime in a tray icon).
|
|
ksni = { version = "0.3", default-features = false, features = ["async-io", "blocking"] }
|
|
libc = "0.2"
|
|
|
|
# Build-time icon embedding (exe icon + the status-variant tray icons), host-gated like the
|
|
# Windows client's build.rs — cross-builds from Linux CI runners skip it.
|
|
[target.'cfg(windows)'.build-dependencies]
|
|
winresource = "0.1"
|