5d9f1ccb6d
ci / docs-site (push) Successful in 54s
ci / web (push) Successful in 57s
docker / build-push (--build-arg FEDORA_VERSION=44, ci, ci/fedora-rpm.Dockerfile, punktfunk-fedora44-rpm) (push) Successful in 6s
docker / build-push (., web/Dockerfile, punktfunk-web) (push) Successful in 4s
apple / swift (push) Successful in 1m6s
docker / build-push (ci, ci/fedora-rpm.Dockerfile, punktfunk-fedora-rpm) (push) Successful in 5s
docker / build-push (ci, ci/rust-ci.Dockerfile, punktfunk-rust-ci) (push) Successful in 4s
decky / build-publish (push) Successful in 24s
docker / build-push (docs-site, docs-site/Dockerfile, punktfunk-docs) (push) Successful in 46s
ci / bench (push) Successful in 6m13s
apple / screenshots (push) Successful in 5m33s
windows-host / package (push) Successful in 9m42s
docker / deploy-docs (push) Successful in 5m59s
android / android (push) Successful in 13m48s
arch / build-publish (push) Successful in 13m59s
rpm / build-publish (44, fedora-44, punktfunk-fedora44-rpm) (push) Successful in 12m52s
deb / build-publish (push) Successful in 15m5s
rpm / build-publish (43, bazzite, punktfunk-fedora-rpm) (push) Successful in 15m7s
ci / rust (push) Successful in 18m35s
mDNS advertisement (native _punktfunk._udp AND GameStream _nvstream) can now be disabled with --no-mdns on serve/punktfunk1-host or PUNKTFUNK_MDNS=0 (the PUNKTFUNK_ZEROCOPY off-grammar) — for multicast-dead environments (bridged Docker, CI netns) where the advert reaches nobody or fails outright and aborts the GameStream plane; clients dial a manually-added host instead (mDNS-blind host-add works since the 0.8.4 dial-first fix). Unit tests no longer advertise on the LAN (mdns: false). punktfunk1-host gains --pairing-pin <PIN> (the already-plumbed fixed-PIN test seam, now CLI-exposed; empty refused like --mgmt-token) so a CI harness runs a deterministic SPAKE2 ceremony instead of scraping the logged PIN. Verified live: --no-mdns + PUNKTFUNK_MDNS=0 skip the advert, --pairing-pin arms with the fixed PIN, and a punktfunk1-host --source synthetic + punktfunk-probe loopback run passes verification (60/60 frames, 0 mismatch). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
133 lines
6.0 KiB
Rust
133 lines
6.0 KiB
Rust
//! mDNS advertisement of the native punktfunk/1 service so native clients auto-discover the
|
|
//! host — the native-protocol analogue of the GameStream `_nvstream._tcp` advert
|
|
//! ([`crate::gamestream::mdns`]).
|
|
//!
|
|
//! The service type is **`_punktfunk._udp.local.`** (UDP because punktfunk/1 is QUIC, and the
|
|
//! advertised port is the QUIC control/data port a client `--connect`s). TXT records carry:
|
|
//! - `proto` — the wire protocol id ([`NATIVE_PROTO`]), so a future incompatible revision is
|
|
//! distinguishable by discovery alone;
|
|
//! - `fp` — the host certificate SHA-256 (lowercase hex), the exact value a client pins. mDNS is
|
|
//! unauthenticated, so this is advisory — TOFU/pinning still verifies it on connect — but it
|
|
//! lets a picker show the fingerprint and pre-pin a chosen host;
|
|
//! - `pair` — `required` or `optional`, so a client can tell up front whether it must run the PIN
|
|
//! pairing ceremony before it can stream;
|
|
//! - `id` — the stable host uniqueid (dedup across IPs / re-advertises);
|
|
//! - `mgmt` — the management API's TCP port (when it serves one), so a client can fetch the host's
|
|
//! game library (`GET /api/v1/library`, mTLS) on the SAME IP without assuming the default port.
|
|
//! Omitted by a host with no mgmt API (the standalone `punktfunk1-host`).
|
|
//! - `mac` — the host's wake-capable NIC MAC(s) (comma-separated, routed NIC first), which a client
|
|
//! persists so it can Wake-on-LAN this host after it sleeps. Advisory/unauthenticated (a wrong
|
|
//! MAC only makes a wake fail). Omitted when none can be read.
|
|
|
|
use anyhow::{Context, Result};
|
|
use mdns_sd::{ServiceDaemon, ServiceInfo};
|
|
use std::collections::HashMap;
|
|
use std::net::IpAddr;
|
|
|
|
/// The native-protocol mDNS service type. Clients browse this to find punktfunk/1 hosts.
|
|
pub const NATIVE_SERVICE: &str = "_punktfunk._udp.local.";
|
|
|
|
/// mDNS advertisement gate — `PUNKTFUNK_MDNS`. Default ON; `0|false|off|no` (the
|
|
/// `PUNKTFUNK_ZEROCOPY` off-grammar) disables BOTH the native and GameStream adverts, for
|
|
/// environments where multicast is dead or unwanted (bridged Docker, CI network namespaces,
|
|
/// locked-down VLANs): the advert there reaches nobody — or fails outright and aborts the
|
|
/// GameStream plane — while clients can always dial a manually-added host (mDNS-blind
|
|
/// host-add works since the 0.8.4 dial-first fix). CLI `--no-mdns` sets the same knob.
|
|
pub(crate) fn mdns_enabled() -> bool {
|
|
!std::env::var("PUNKTFUNK_MDNS")
|
|
.map(|s| mdns_off_value(&s))
|
|
.unwrap_or(false)
|
|
}
|
|
|
|
/// `true` iff the `PUNKTFUNK_MDNS` value means "off". Split from the env read for testability
|
|
/// (env vars are process-global; tests must not race the parallel suite by setting them).
|
|
fn mdns_off_value(s: &str) -> bool {
|
|
matches!(
|
|
s.trim().to_ascii_lowercase().as_str(),
|
|
"0" | "false" | "off" | "no"
|
|
)
|
|
}
|
|
|
|
/// Wire protocol id advertised in the `proto` TXT record.
|
|
pub const NATIVE_PROTO: &str = "punktfunk/1";
|
|
|
|
/// Holds the mDNS daemon; dropping it unregisters the service.
|
|
pub struct Advert {
|
|
_daemon: ServiceDaemon,
|
|
}
|
|
|
|
/// Advertise the native host on the LAN. `fingerprint` is the host cert SHA-256 (lowercase hex);
|
|
/// `require_pairing` tells a discovering client whether it must pair before it can stream;
|
|
/// `mgmt_port` is the management API's port (`Some` when this host serves one — the client browses
|
|
/// the library there over mTLS on the advertised IP), `None` for a host with no mgmt API.
|
|
pub fn advertise_native(
|
|
hostname: &str,
|
|
ip: IpAddr,
|
|
port: u16,
|
|
fingerprint: &str,
|
|
require_pairing: bool,
|
|
uniqueid: &str,
|
|
mgmt_port: Option<u16>,
|
|
) -> Result<Advert> {
|
|
let daemon = ServiceDaemon::new().context("create mDNS daemon")?;
|
|
let host_name = format!("{hostname}.local.");
|
|
let mut props: HashMap<String, String> = HashMap::new();
|
|
props.insert("proto".into(), NATIVE_PROTO.into());
|
|
props.insert("fp".into(), fingerprint.to_string());
|
|
props.insert(
|
|
"pair".into(),
|
|
if require_pairing {
|
|
"required"
|
|
} else {
|
|
"optional"
|
|
}
|
|
.into(),
|
|
);
|
|
props.insert("id".into(), uniqueid.to_string());
|
|
if let Some(mgmt) = mgmt_port {
|
|
props.insert("mgmt".into(), mgmt.to_string());
|
|
}
|
|
// `mac` — the host's wake-capable NIC MAC(s), comma-separated `aa:bb:cc:dd:ee:ff`, routed NIC
|
|
// first. A client persists these while the host is awake so it can send a Wake-on-LAN magic
|
|
// packet to wake it later (when it's asleep and no longer advertising). Unauthenticated like
|
|
// the rest of the advert, but a wrong MAC only makes a wake fail — the magic packet is inert
|
|
// and the cert fingerprint still gates the actual connection. Omitted when none can be read.
|
|
let macs = crate::wol::wake_macs(ip);
|
|
if !macs.is_empty() {
|
|
props.insert("mac".into(), macs.join(","));
|
|
}
|
|
// Detect & warn (never modifies) if the routed NIC isn't armed to wake — the usual reason WoL
|
|
// silently fails.
|
|
crate::wol::warn_if_not_armed(ip);
|
|
let service = ServiceInfo::new(NATIVE_SERVICE, hostname, &host_name, ip, port, props)
|
|
.context("build native mDNS ServiceInfo")?;
|
|
daemon
|
|
.register(service)
|
|
.context("register native mDNS service")?;
|
|
tracing::info!(
|
|
service = "_punktfunk._udp",
|
|
port,
|
|
host = %host_name,
|
|
pair = if require_pairing { "required" } else { "optional" },
|
|
"native punktfunk/1 mDNS advertising"
|
|
);
|
|
Ok(Advert { _daemon: daemon })
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::mdns_off_value;
|
|
|
|
#[test]
|
|
fn mdns_off_grammar() {
|
|
for off in ["0", "false", "off", "no", " OFF ", "False"] {
|
|
assert!(mdns_off_value(off), "{off:?} should disable mDNS");
|
|
}
|
|
// Anything else — including set-but-empty — keeps the advert on (matches the
|
|
// PUNKTFUNK_ZEROCOPY grammar: only an explicit off-value turns it off).
|
|
for on in ["", "1", "true", "yes", "on", "banana"] {
|
|
assert!(!mdns_off_value(on), "{on:?} should keep mDNS on");
|
|
}
|
|
}
|
|
}
|