1fc9ef0050
ci / web (push) Successful in 49s
ci / docs-site (push) Successful in 52s
decky / build-publish (push) Successful in 18s
docker / build-push (--build-arg FEDORA_VERSION=44, ci, ci/fedora-rpm.Dockerfile, punktfunk-fedora44-rpm) (push) Successful in 9s
docker / build-push (., web/Dockerfile, punktfunk-web) (push) Successful in 9s
docker / build-push (ci, ci/fedora-rpm.Dockerfile, punktfunk-fedora-rpm) (push) Successful in 8s
docker / build-push (ci, ci/rust-ci.Dockerfile, punktfunk-rust-ci) (push) Successful in 10s
docker / build-push (docs-site, docs-site/Dockerfile, punktfunk-docs) (push) Successful in 44s
ci / bench (push) Successful in 5m56s
flatpak / build-publish (push) Successful in 6m41s
docker / deploy-docs (push) Successful in 27s
apple / swift (push) Successful in 4m40s
deb / build-publish (push) Successful in 12m7s
arch / build-publish (push) Successful in 14m10s
android / android (push) Successful in 17m16s
ci / rust (push) Successful in 17m57s
rpm / build-publish (43, bazzite, punktfunk-fedora-rpm) (push) Successful in 16m50s
rpm / build-publish (44, fedora-44, punktfunk-fedora44-rpm) (push) Successful in 15m15s
windows-host / package (push) Successful in 14m33s
windows-msix / package (arm64, C:\Users\Public\ffmpeg-arm64, --no-default-features, aarch64-pc-windows-msvc, C:\t-a64) (push) Successful in 3m55s
release / apple (push) Successful in 25m31s
windows-msix / package (x64, C:\Users\Public\ffmpeg, , x86_64-pc-windows-msvc, C:\t) (push) Successful in 3m49s
windows / build (aarch64-pc-windows-msvc) (push) Successful in 5m11s
windows / build (x86_64-pc-windows-msvc) (push) Successful in 6m9s
apple / screenshots (push) Successful in 19m41s
A host's pairing-gate rejections (not armed / bound to another device /
rate-limited / identity required / denied / approval timeout / superseded /
wire-version mismatch) used to drop the connection with a bare code-0 close,
and every client collapsed that — plus plain unreachability — into one
"wrong PIN / not accepted" message. A dead network path, a disarmed host,
and an operator denial were indistinguishable, which is exactly the
misdiagnosis behind the recent Android pairing support thread.
- core: new ungated `reject` module — shared close-code block 0x60–0x67
(+ 0x42 busy promoted from the host), `RejectReason`, and
`PunktfunkError::Rejected`; `pair()`/`connect()` decode the host's
ApplicationClosed code into `Rejected` instead of a generic Io error.
C ABI v7: status block −20…−28 and `punktfunk_connect_ex8` (`status_out`
reports the failure cause; NULL-return alone can't). Wire unchanged —
old peers see exactly the old bare close.
- host: every gate rejection `conn.close()`s with its typed code (and the
human reason as close bytes) before erroring out of the session task.
- pf-client-core: shared `pair_error_message`/`connect_reject_message`
wording consumed by the Windows + Linux + console-UI + CLI surfaces; a
connect failure now renders the host's stated reason.
- android: `nativeTakeLastError()` JNI token + `ConnectErrors.kt` — a
network timeout is no longer reported as "wrong PIN, or the host isn't
armed", and a typed rejection skips the wake-and-wait fallback (the host
is demonstrably awake).
- apple: `HostRejection` + `.rejected`; the pair sheet and session alerts
show the stated reason; connect moves to `ex8`.
Completes the cross-client half of the hunks that rode along in 12148243
(client.rs / trust.rs / punktfunk1.rs) — main did not build without this.
Validated: workspace clippy -D warnings + full test suite green on .21
(EXIT=0, 309 host / 148 core suites); macOS core 147+c_abi green; swift
build green; Android Kotlin + native crate green.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
66 lines
2.8 KiB
Swift
66 lines
2.8 KiB
Swift
// The client's persistent identity + the SPAKE2 PIN pairing ceremony — the trust
|
|
// bootstrap that precedes any pinned PunktfunkConnection.
|
|
|
|
import Foundation
|
|
import PunktfunkCore
|
|
|
|
/// This client's persistent self-signed identity. Generate ONCE with `generateIdentity()`,
|
|
/// store both PEMs (Keychain), present on every connect — the certificate's fingerprint is
|
|
/// how hosts recognize this client after pairing.
|
|
public struct ClientIdentity: Sendable {
|
|
public let certPEM: String
|
|
public let keyPEM: String
|
|
public init(certPEM: String, keyPEM: String) {
|
|
self.certPEM = certPEM
|
|
self.keyPEM = keyPEM
|
|
}
|
|
}
|
|
|
|
/// Generate a fresh client identity (self-signed cert + key, PEM).
|
|
public func generateIdentity() throws -> ClientIdentity {
|
|
var cert = [CChar](repeating: 0, count: 4096)
|
|
var key = [CChar](repeating: 0, count: 4096)
|
|
let rc = punktfunk_generate_identity(&cert, UInt(cert.count), &key, UInt(key.count))
|
|
guard rc == PUNKTFUNK_STATUS_OK.rawValue else {
|
|
throw PunktfunkClientError.status(rc)
|
|
}
|
|
return ClientIdentity(certPEM: String(cString: cert), keyPEM: String(cString: key))
|
|
}
|
|
|
|
/// Run the PIN pairing ceremony: the host displays a 4-digit PIN (its log/UI), the user
|
|
/// types it here. On success the host stores this client's identity and the returned
|
|
/// fingerprint is the host's now-VERIFIED identity — persist it and pass it as `pinSHA256`
|
|
/// to every later connect. Throws `.wrongPIN` when the proof is rejected.
|
|
public func pair(
|
|
host: String, port: UInt16 = 9777,
|
|
identity: ClientIdentity, pin: String, name: String,
|
|
timeoutMs: UInt32 = 90_000
|
|
) throws -> Data {
|
|
var observed = [UInt8](repeating: 0, count: 32)
|
|
// The C header types PunktfunkStatus as a bare int32 (C17, no enum import), so the ABI
|
|
// functions return Int32 directly — compare against the enum constants' rawValue, the
|
|
// same bridging the connection methods use (statusOK etc.).
|
|
let rc = host.withCString { cs in
|
|
identity.certPEM.withCString { cert in
|
|
identity.keyPEM.withCString { key in
|
|
pin.withCString { p in
|
|
name.withCString { n in
|
|
punktfunk_pair(cs, port, cert, key, p, n, &observed, timeoutMs)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
switch rc {
|
|
case PUNKTFUNK_STATUS_OK.rawValue: return Data(observed)
|
|
case PUNKTFUNK_STATUS_CRYPTO.rawValue: throw PunktfunkClientError.wrongPIN
|
|
default:
|
|
// A typed host rejection (pairing not armed / rate-limited / armed for another
|
|
// device) carries its own reason — never report it as a bad PIN or dead network.
|
|
if let rejection = HostRejection(status: rc) {
|
|
throw PunktfunkClientError.rejected(rejection)
|
|
}
|
|
throw PunktfunkClientError.status(rc)
|
|
}
|
|
}
|