Triaged the multi-agent review of the renegotiation + pairing + Sway + AV1/surround batch
(1 critical, 11 major/minor confirmed). Fixes:
CRITICAL — PIN pairing was offline-brute-forceable. The HMAC-of-PIN proof let an active
MITM who terminates the TOFU ceremony recover the 4-digit PIN by offline dictionary search
(all other inputs observable) and forge a correctly-bound proof. Replaced with **SPAKE2**
(balanced PAKE, `spake2` crate) + key-confirmation MACs, binding both cert fingerprints as
the SPAKE2 identities: an attacker gets exactly ONE online guess, no offline search, and
mismatched cert views (a real MITM) never reach a shared key. Also reworked the UX to an
"arming PIN" — one PIN per arming window shown at host startup (the SPAKE2 client needs the
PIN to build its first message, so it can't be minted per-connection). Validated live:
wrong PIN rejected in 0.1s, right PIN pairs + persists + the paired identity streams.
Pairing hardening: `--allow-pairing`/`--require-pairing` must arm pairing (default rejects
unsolicited ceremonies); per-host cooldown bounds online guessing; the client flushes its
CONNECTION_CLOSE so a refused ceremony can't wedge the sequential host for the full timeout;
atomic (temp+rename) paired-store writes.
Protocol: control/pairing messages use a distinct CTL_MAGIC (PKFc) — fully disjoint from
the positional Hello namespace (a future abi_version can't be misparsed as a control
message); all typed decodes are length-exact. ABI_VERSION → 2 (punktfunk_connect signature
gained the identity params; header regenerated).
Renegotiation: drain the reconfig channel to the NEWEST mode (one rebuild, not one per
stale step); validate refresh_hz; build the new pipeline BEFORE dropping the old so a
rebuild failure keeps the session on its current mode instead of killing it.
GameStream: packetDuration snaps to {5,10} (an in-between value isn't a legal Opus frame
size and would kill audio). Sway: chooser file moved to $XDG_RUNTIME_DIR (was a fixed
world-writable /tmp path — DoS / capture-misdirection by another local user).
Swift: fixed two compile breakers in the new pairing/identity APIs (Int32 status .rawValue,
UInt cap cast). New SPAKE2 + namespace-disjointness + pairing-roundtrip unit tests; the
in-process pairing test now also exercises the arming PIN + cooldown. 114 tests green,
clippy -D warnings clean (both feature sets), fmt, C-ABI harness.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
10 KiB
punktfunk Apple client (SwiftUI)
The native macOS/iOS client for punktfunk/1 (the post-GameStream protocol). All
networking/protocol work — QUIC control plane, UDP data plane, GF(2¹⁶) FEC, AES-GCM,
input datagrams, Opus audio, cert pinning — lives in the shared Rust core (statically
linked as PunktfunkCore.xcframework); this package is the Swift shell: decode
(VideoToolbox), present (SwiftUI), input capture.
Status — first light achieved (2026-06-10)
Validated live, Mac ↔ Linux box over the LAN: gamescope virtual output → NVENC HEVC →
punktfunk/1 (GF(2¹⁶) FEC + AES-GCM over UDP, QUIC control) → VideoToolbox →
AVSampleBufferDisplayLayer on glass at 1280×720@60, with mouse/keyboard flowing back as
QUIC datagrams into the host's gamescope EIS injector (thousands of events injected during
the session). Headless variant of the same proof: RemoteFirstLightTests decoded 60/60
received AUs spanning 983 ms of host capture clock.
The connector underneath (punktfunk_core::client::NativeClient over the C ABI) carries the
full session: video AUs, Opus audio (nextAudio()), rumble (nextRumble()),
input incl. gamepads, and cert pinning + TOFU (pinSHA256:/hostFingerprint) — see
m3.rs::tests::c_abi_connection_roundtrip (three sequential sessions: TOFU, pinned
reconnect, wrong-pin rejection). The host (punktfunk-host m3-host) is a persistent listener:
reconnect at will during development.
What's here, all compiled and tested on macOS (Xcode 26.5 / Swift 6.3):
PunktfunkKit(library)PunktfunkConnection.swift— wrapper over the C ABI. AUs/audio are copied intoData(the C pointer is only valid until the next call of the same kind).close()is safe from any thread: per-plane locks enforce the C contract ("never close with anext_au/next_audioin flight") instead of leaving it to callers. Pinning + TOFU viapinSHA256:/hostFingerprint.AnnexB.swift— in-band VPS/SPS/PPS →CMVideoFormatDescription; Annex-B → AVCCCMSampleBufferwithDisplayImmediatelyset.StreamView.swift— SwiftUINSViewRepresentableoverAVSampleBufferDisplayLayer(stage-1 presenter: the layer hardware-decodes compressed HEVC itself). One pump thread per view, token-cancelled so reconnects can't double-pump.InputCapture.swift—GCMouseraw deltas +GCKeyboardHID→VK mapping (the host'svk_to_evdevconsumes Windows VKs), with fractional-delta accumulation so sub-pixel motion isn't truncated away. Buttons use GameStream ids (1=left … 5=X2); scroll is WHEEL_DELTA(120)-scaled.
PunktfunkClient(the app): hosts grid (saved in UserDefaults), "+" toolbar sheet to add hosts, stream mode in Settings (⌘,), trust-on-first-use fingerprint prompt over the live-but-blurred stream → pinned reconnects, fps/Mb-s HUD. (Audio playback and gamepad capture are not wired into the app yet — the connector surface is there; see notes 5–6.)- Tests (
swift test): byte-level Annex-B units; a real-codec round trip (VTCompressionSession-encoded HEVC rebuilt as the host's wire shape →AnnexB→ VTDecompressionSession → pixels); loopback integration against a real local host (test-loopback.sh); the remote first-light test above.
Build / run / test (on a Mac)
rustup target add aarch64-apple-darwin x86_64-apple-darwin
bash scripts/build-xcframework.sh # → clients/apple/PunktfunkCore.xcframework
cd clients/apple
swift build && swift test # loopback/remote tests self-skip without a host
swift run PunktfunkClient # the unbundled dev shell (CLI)
open Punktfunk.xcodeproj # the real app: ⌘R builds + runs Punktfunk.app
bash test-loopback.sh # full loopback proof: builds punktfunk-host
# (synthetic source — runs on macOS), streams
# byte-verified frames into the Swift client
# against the real host (Linux box, see CLAUDE.md "Running on this box") — m3-host is a
# persistent listener, reconnect at will:
# PUNKTFUNK_COMPOSITOR=gamescope PUNKTFUNK_GAMESCOPE_APP=vkcube PUNKTFUNK_ZEROCOPY=1 \
# cargo run -rp punktfunk-host -- m3-host --source virtual --seconds 60
PUNKTFUNK_REMOTE_HOST=<box-ip> swift test --filter RemoteFirstLightTests # headless
PUNKTFUNK_AUTOCONNECT=<box-ip> PUNKTFUNK_MODE=1280x720x60 swift run PunktfunkClient # on glass
Xcode project (Punktfunk.xcodeproj)
The app target Punktfunk wraps the same sources as the swift run shell
(Sources/PunktfunkClient, a synchronized folder — no duplication) plus App/ (asset
catalog) and links PunktfunkKit from the local package. Generated Info.plist, ad-hoc
signing, bundle id io.unom.punktfunk. Notes:
- App icon:
App/Assets.xcassetsships an emptyAppIconslot. For an Icon Composer.icon: add the file to the project (target Punktfunk), set it as the App Icon in the target's General tab, and delete the placeholderAppIcon.appiconset. Heads-up: CLIactool(Xcode 26.5) crashed compilingpunktfunk_Logo.icon— if Xcode does the same, suspect the icon bundle (it has a duplicate-named layer, "…Layer-3 2.svg"), not the project. - Tests from Xcode: the package tests run with
swift test; to get them on ⌘U, addPunktfunkKitTestsonce via Edit Scheme → Test → + (Xcode persists it into the shared scheme — a hand-written package-test reference doesn't resolve headlessly). xcodebuild -project Punktfunk.xcodeproj -scheme Punktfunk buildworks headlessly.
Notes for whoever picks this up next
- cbindgen import quirk (the predicted "small compile fixes", now fixed): the
C17-compatible header spells
PunktfunkStatus/PunktfunkInputKindas integer typedefs while the enum constants import into Swift as a distinct same-named type — bridge with.rawValue(see the top ofPunktfunkConnection.swift). Don't fight the generated header. - ABI contract: one video pump thread per connection, plus optionally one separate
audio drain thread for
nextAudio()/nextRumble()(the core keeps per-plane borrow slots, so the planes never alias);send()is enqueue-only and safe alongside all of them. The wrapper's per-plane locks makeclose()safe from anywhere (it waits out in-flight polls, ≤ their timeouts). - Decode flow: the host opens every stream with an IDR carrying VPS/SPS/PPS in-band
and recovery keyframes re-send them — "refresh the format description on every IDR"
(what
StreamViewdoes) is sufficient; there is no out-of-band extradata, ever. - Stage 2 (next): explicit
VTDecompressionSession+CAMetalLayerfor frame-pacing control (ProMotion/120 Hz), glass-to-glass measurement viatools/latency-probe(the host stampspts_nswith its capture wall clock; across machines you need a clock offset estimate from the QUIC RTT). - Audio:
nextAudio()yields raw Opus packets (48 kHz stereo, one 5 ms frame each, sequence-numbered). Decode with libopus orAVAudioConverter/kAudioFormatOpusinto anAVAudioEnginesource node; conceal gaps (drop/dup) rather than blocking — the Rust side buffers 320 ms and drops the newest packet when the puller lags. Wall-clockptsNsshares the host clock with video AUs for A/V sync. Wiring this intoPunktfunkClientis the next app-side task. - Gamepads:
GCController→.gamepadButton(...)/.gamepadAxis(...)events (wire contract documented on the constructors; the host accumulates them into a virtual Xbox 360 pad). PollnextRumble()and feedGCDeviceHapticsfor force feedback. Client-side capture isn't inInputCaptureyet. - Trust — the full ceremony exists now (SPAKE2).
generateIdentity()once (persist both PEMs in the Keychain), thenpair(host:identity:pin:name:)with the 4-digit PIN the host prints when it ARMS pairing (--allow-pairing/--require-pairing; one PIN per arming window, shown at startup — the user reads it before pairing). Returns the host's VERIFIED fingerprint; persist it and passpinSHA256:+identity:to every connect. Pairing is a real PAKE: a wrong PIN gets ONE online guess (no offline dictionary attack), throwing.wrongPIN; a wrong-size pin throws.invalidPin. The TOFU flowPunktfunkClientalready implements (fingerprint confirmation sheet, per-hostHostStore, "Forget Identity") keeps working against hosts not running--require-pairing; upgrading the sheet to a PIN-entry field closes the remaining gap — with--require-pairingthe host now authorizes clients too (the "other direction" is no longer open, opt-in per host). 7b. Resize without reconnect:requestMode(width:height:refreshHz:)mid-stream — the host rebuilds at the new mode in ~90 ms; the first new-mode AU is an IDR with fresh parameter sets (the refresh-on-IDR decode flow handles it untouched) andcurrentMode()reflects the switch. Wire it to window-resize events. - Input capture caveats (stage 1): GC handlers only fire while the app has focus —
on focus loss
InputCaptureauto-releases everything still held (keys + buttons) so nothing sticks down host-side. While the stream has focus the LOCAL cursor is hidden and frozen mid-view (CursorCapturein StreamView.swift — the host renders its own cursor; the local one diverges from it and a stray click would focus another app); Cmd+Tab frees it, ⌘D disconnects. Local shortcuts (⌘-anything) still also reach the host; a capture toggle is a small follow-up. One live capture per process (the GC mouse/keyboard singletons have a single handler slot — ownership is tracked so a stale capture's stop() can't clobber a newer one). - iOS: same package (
BUILD_IOS=1for the xcframework slice);StreamViewneeds theUIViewRepresentabletwin and touch→input mapping.
Known limitations of the current host (relevant to client UX)
- One session at a time (the listener is persistent, but a second concurrent client waits in the accept queue until the current session ends — the virtual output and encoder are single-tenant).
- Mid-stream renegotiation (resolution change without reconnect) is designed-for but not implemented (the Welcome is one-shot today).
- Host-side gamepad injection needs
/dev/uinputaccess on the box (udev rule fromdocs/linux-setup.md).