mirror of
https://github.com/permissionlesstech/bitchat.git
synced 2026-07-26 14:45:22 +00:00
* Add capability bits to announce TLV Announces now carry an optional capabilities TLV (0x05): a little-endian bitfield with named bits for upcoming features (prekeys, wifiBulk, gateway, groups, board, vouch, meshDiagnostics). Old clients skip the unknown TLV; peers without it decode as nil so features can distinguish "legacy peer" from "advertises nothing". PeerCapabilities lives in BitFoundation with a minimal-length encoding that preserves unknown bits for forward compatibility. Peer capabilities are stored in the BLE peer registry on verified announce and exposed via BLEService.peerCapabilities(_:). The local advertisement set is empty until each feature ships its bit. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Transitive verification: vouch for verified peers over Noise When a Noise session establishes with a peer I verified and that peer advertises the .vouch capability, send signed attestations (up to 16, most recently verified first, at most once per peer per 24h) for the OTHER fingerprints I verified. Receivers accept vouches only from senders they verified themselves, verify the Ed25519 signature against the sender's announce-bound signing key, and surface the result as a new derived trust tier: vouched (unfilled seal) between casual and trusted. Protocol: - NoisePayloadType.vouch = 0x12 carries a batch of TLV attestations: voucheeFingerprint (32B), voucheeSigningKey (32B), timestamp (uint64 ms BE), Ed25519 signature over "bitchat-vouch-v1" | fingerprint | signingKey | timestamp. The voucher is implicit in the authenticated session. - PeerCapabilities.localSupported now advertises .vouch. Storage (SecureIdentityStateManager / IdentityCache): - vouches keyed by vouchee, capped at 8 vouchers each; validity is recomputed on read (voucher still verified-by-me, < 30 days old), so unverifying a voucher retires their vouches without cascade deletes. - New IdentityCache fields are Optional so pre-existing encrypted caches decode cleanly; TrustLevel.vouched is inserted mid-ladder but raw values are strings, so persisted values are unaffected (and vouched itself is never persisted). - Panic wipe clears vouch state with the rest of the identity cache. UI: unfilled checkmark.seal badge in the mesh peer list (filled seal stays exclusive to verified) and a "vouched for by N people you verified" section with voucher names in FingerprintView; VoiceOver labels and xcstrings entries included. Tests: attestation encode/decode + signature (forged/tampered/expired), accept-policy gates, batch cap, trust-level derivation incl. voucher invalidation, persistence compat, and coordinator exchange/accept policies. Full macOS suite: 1088 tests passing. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Fix CI deadlock in vouch tests and live-refresh the fingerprint sheet on vouch acceptance Two fixes for PR #1380 review findings: 1. CI "Run Swift Tests (app)" hang (exit 137): the new SecureIdentityStateManagerVouchTests suite was nonisolated, so Swift Testing ran its tests in parallel on the Swift Concurrency cooperative pool. Each test enqueues a queue.async(.barrier) write (setVerified) and immediately blocks in queue.sync / queue.sync(.barrier) (recordVouch / effectiveTrustLevel). On CI's few-core runners every cooperative-pool thread ended up parked behind a pending barrier that never got a dispatch worker, deadlocking the whole test process until the watchdog SIGKILLed it. The suite is now @MainActor, matching the production isolation of the vouch API (ChatVouchCoordinator is @MainActor) and keeping blocking syncs off the cooperative pool. 2. Codex P2: an open fingerprint sheet did not refresh its vouched badge when a vouch batch was accepted - VerificationModel.bind() never observed the trust-change signal. It now subscribes to the "peerStatusUpdated" notification that ChatVouchCoordinator.notifyPeerTrustChanged() posts (same source PeerListModel uses) and forwards it to objectWillChange. Added a regression test that pins VerificationModel's own subscription (verified to fail without the fix). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Skip media-wipe detached tasks under tests (shared-filesystem race) panicClearAllData and clearCurrentPublicTimeline delete the real ~/Library/Application Support/files tree in detached utility-priority tasks. The SPM test process shares that tree and ChatViewModelTests invoke both methods, so under parallel scheduling the wipe lands at a nondeterministic time — deleting media a concurrently running test just wrote (and the developer's real app data with it). Guard both with the existing TestEnvironment.isRunningTests pattern, mirroring the same fix on feat/mesh-diagnostics (#1377). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Port vouch capability-race fix to feat/vouching (ports b8adcbe9) Ports the on-device-confirmed fix from the integration test branch (commit b8adcbe9) onto feat/vouching so PR #1380 is actually correct. On-device testing confirmed the transitive vouch propagated once the send was triggered on verify / announce arrival rather than auth alone. Vouch attestations only ever sent from peerAuthenticated, gated on the peer's .vouch capability. That capability arrives via the peer's announce, processed independently of the Noise handshake, so at auth time the set was usually empty -> gate failed -> vouch silently skipped and never retried. - Refactor the send path into a reusable attemptVouch(to:fingerprint:now:). - Trigger on peer-list updates (peersUpdated): fired after every verified announce, so the batch goes out once the .vouch bit actually arrives. - Trigger on local verification (vouchToConnectedVerifiedPeers): verifying a peer runs a vouch pass over connected verified peers, covering the verify-while-connected case and propagating the new identity onward. - Relax the capability gate: treat an empty/unknown set as eligible (the Noise 0x12 payload is ignored by non-supporting peers); only skip when a non-empty set explicitly lacks .vouch. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: jack <jackjackbits@users.noreply.github.com> Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
273 lines
12 KiB
Swift
273 lines
12 KiB
Swift
import BitFoundation
|
|
import BitLogger
|
|
import Foundation
|
|
|
|
/// The narrow surface `ChatVouchCoordinator` needs from its owner.
|
|
///
|
|
/// Follows the `ChatDeliveryContext` exemplar: the coordinator depends on the
|
|
/// minimal context it actually uses instead of holding an `unowned` back-ref
|
|
/// to the whole `ChatViewModel`. This keeps the coordinator independently
|
|
/// testable (see `ChatVouchCoordinatorContextTests`) and makes its true
|
|
/// dependencies explicit.
|
|
@MainActor
|
|
protocol ChatVouchContext: AnyObject {
|
|
// MARK: Identity & trust state
|
|
func getFingerprint(for peerID: PeerID) -> String?
|
|
func isVerifiedFingerprint(_ fingerprint: String) -> Bool
|
|
/// The peer's announce-bound Ed25519 signing key, if known this session.
|
|
func signingKey(forFingerprint fingerprint: String) -> Data?
|
|
/// Verified fingerprints ordered most recently verified first.
|
|
func recentlyVerifiedFingerprints(limit: Int, excluding fingerprint: String) -> [String]
|
|
/// Stores an accepted vouch (identity manager enforces the storage gates).
|
|
@discardableResult
|
|
func recordVouch(voucheeFingerprint: String, voucherFingerprint: String, timestamp: Date) -> Bool
|
|
func lastVouchBatchSent(to fingerprint: String) -> Date?
|
|
func markVouchBatchSent(to fingerprint: String, at date: Date)
|
|
|
|
// MARK: Transport
|
|
func peerCapabilities(for peerID: PeerID) -> PeerCapabilities
|
|
/// PeerIDs with a currently established mesh session (used to run a vouch
|
|
/// pass over peers we are already connected to when we verify someone).
|
|
func connectedPeerIDs() -> [PeerID]
|
|
/// Appends a session-established observer (additive; never displaces the
|
|
/// verification coordinator's callbacks).
|
|
func addPeerAuthenticatedObserver(_ handler: @escaping (PeerID, String) -> Void)
|
|
/// Signs `data` with our Noise (Ed25519) signing key.
|
|
func noiseSignData(_ data: Data) -> Data?
|
|
func sendVouchAttestations(_ payload: Data, to peerID: PeerID)
|
|
|
|
// MARK: UI refresh
|
|
/// Signals that derived trust state changed so peer list / fingerprint
|
|
/// views recompute badges.
|
|
func notifyPeerTrustChanged()
|
|
}
|
|
|
|
extension ChatViewModel: ChatVouchContext {
|
|
// `getFingerprint(for:)` and `isVerifiedFingerprint(_:)` are shared
|
|
// requirements with the verification context and satisfied by existing
|
|
// `ChatViewModel` members. The members below flatten nested service
|
|
// accesses into intent-named calls.
|
|
|
|
func signingKey(forFingerprint fingerprint: String) -> Data? {
|
|
identityManager.signingPublicKey(forFingerprint: fingerprint)
|
|
}
|
|
|
|
func recentlyVerifiedFingerprints(limit: Int, excluding fingerprint: String) -> [String] {
|
|
identityManager.mostRecentlyVerifiedFingerprints(limit: limit, excluding: fingerprint)
|
|
}
|
|
|
|
@discardableResult
|
|
func recordVouch(voucheeFingerprint: String, voucherFingerprint: String, timestamp: Date) -> Bool {
|
|
identityManager.recordVouch(
|
|
voucheeFingerprint: voucheeFingerprint,
|
|
voucherFingerprint: voucherFingerprint,
|
|
timestamp: timestamp
|
|
)
|
|
}
|
|
|
|
func lastVouchBatchSent(to fingerprint: String) -> Date? {
|
|
identityManager.lastVouchBatchSent(to: fingerprint)
|
|
}
|
|
|
|
func markVouchBatchSent(to fingerprint: String, at date: Date) {
|
|
identityManager.markVouchBatchSent(to: fingerprint, at: date)
|
|
}
|
|
|
|
func peerCapabilities(for peerID: PeerID) -> PeerCapabilities {
|
|
meshService.peerCapabilities(peerID)
|
|
}
|
|
|
|
func connectedPeerIDs() -> [PeerID] {
|
|
Array(connectedPeers)
|
|
}
|
|
|
|
func addPeerAuthenticatedObserver(_ handler: @escaping (PeerID, String) -> Void) {
|
|
meshService.addPeerAuthenticatedObserver(handler)
|
|
}
|
|
|
|
func noiseSignData(_ data: Data) -> Data? {
|
|
meshService.noiseSignData(data)
|
|
}
|
|
|
|
func sendVouchAttestations(_ payload: Data, to peerID: PeerID) {
|
|
meshService.sendVouchAttestations(payload, to: peerID)
|
|
}
|
|
|
|
func notifyPeerTrustChanged() {
|
|
// PeerListModel refreshes on this notification; the view-model change
|
|
// covers FingerprintView / VerificationModel consumers.
|
|
NotificationCenter.default.post(name: Notification.Name("peerStatusUpdated"), object: nil)
|
|
notifyUIChanged()
|
|
}
|
|
}
|
|
|
|
/// Transitive verification ("vouching"): when a Noise session comes up with a
|
|
/// peer I verified, I attest — over that authenticated, encrypted session —
|
|
/// to the other identities I have verified. Receivers accept such vouches
|
|
/// only from peers *they* verified, giving a serverless
|
|
/// verified-by-people-you-verified tier (`TrustLevel.vouched`).
|
|
@MainActor
|
|
final class ChatVouchCoordinator {
|
|
/// Minimum spacing between vouch batches to the same peer (persisted).
|
|
static let batchInterval: TimeInterval = 24 * 60 * 60
|
|
|
|
private unowned let context: any ChatVouchContext
|
|
|
|
init(context: any ChatVouchContext) {
|
|
self.context = context
|
|
}
|
|
|
|
/// Registers the session-established hook. Additive alongside the
|
|
/// verification coordinator's callbacks; call once at bootstrap.
|
|
func setupNoiseCallbacks() {
|
|
context.addPeerAuthenticatedObserver { [weak self] peerID, fingerprint in
|
|
DispatchQueue.main.async { [weak self] in
|
|
self?.peerAuthenticated(peerID, fingerprint: fingerprint)
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Trigger — session established: on a Noise session coming up with a peer
|
|
/// I verified, attempt to send a vouch batch. Kept as the historical entry
|
|
/// point; the real work lives in `attemptVouch`.
|
|
func peerAuthenticated(_ peerID: PeerID, fingerprint: String, now: Date = Date()) {
|
|
attemptVouch(to: peerID, fingerprint: fingerprint, now: now)
|
|
}
|
|
|
|
/// Trigger — verified announce processed: a peer's `.vouch` capability
|
|
/// arrives on its *announce*, which is handled independently of the Noise
|
|
/// handshake. This is invoked on every peer-list update (fired after each
|
|
/// verified announce), so it closes the capability race — the batch that
|
|
/// `peerAuthenticated` couldn't send (capabilities not yet known) goes out
|
|
/// once the capability-bearing announce lands. Throttled per peer.
|
|
func peersUpdated(_ peerIDs: [PeerID], now: Date = Date()) {
|
|
for peerID in peerIDs {
|
|
guard let fingerprint = context.getFingerprint(for: peerID) else { continue }
|
|
attemptVouch(to: peerID, fingerprint: fingerprint, now: now)
|
|
}
|
|
}
|
|
|
|
/// Trigger — local verification completed: the user just verified a peer.
|
|
/// Run a vouch pass over every currently connected peer I verified. This
|
|
/// makes vouching fire when verifying someone already connected (whose
|
|
/// session is authenticated, so `peerAuthenticated` never re-fires), and it
|
|
/// propagates the newly-verified identity to my other verified peers.
|
|
/// Throttled per peer by `batchInterval`, so it can't spam.
|
|
func vouchToConnectedVerifiedPeers(now: Date = Date()) {
|
|
var sentCount = 0
|
|
for peerID in context.connectedPeerIDs() {
|
|
guard let fingerprint = context.getFingerprint(for: peerID) else { continue }
|
|
if attemptVouch(to: peerID, fingerprint: fingerprint, now: now) {
|
|
sentCount += 1
|
|
}
|
|
}
|
|
if sentCount > 0 {
|
|
SecureLogger.info(
|
|
"🪪 verify-triggered vouch pass sent to \(sentCount) connected peer(s)",
|
|
category: .security
|
|
)
|
|
}
|
|
}
|
|
|
|
/// Exchange policy shared by every trigger: to a peer I verified, send
|
|
/// attestations for up to `VouchAttestation.maxBatchCount` *other* verified
|
|
/// fingerprints (most recently verified first), at most once per peer per
|
|
/// `batchInterval`. Returns whether a batch was actually sent.
|
|
@discardableResult
|
|
func attemptVouch(to peerID: PeerID, fingerprint: String, now: Date = Date()) -> Bool {
|
|
guard context.isVerifiedFingerprint(fingerprint) else { return false }
|
|
|
|
// Capability gate, race-tolerant: a peer's `.vouch` bit is carried on
|
|
// its announce, processed independently of the Noise handshake, so at
|
|
// authentication time the capability set is frequently still empty.
|
|
// Treat an empty/unknown set as eligible — the payload is a Noise
|
|
// `0x12` (`NoisePayloadType.vouch`) that non-supporting peers harmlessly
|
|
// ignore, so sending on an unknown set is safe and avoids the race
|
|
// dropping the batch. Only skip when the peer advertised a non-empty
|
|
// capability set that explicitly lacks `.vouch`.
|
|
let capabilities = context.peerCapabilities(for: peerID)
|
|
if !capabilities.isEmpty, !capabilities.contains(.vouch) { return false }
|
|
|
|
if let lastSent = context.lastVouchBatchSent(to: fingerprint),
|
|
now.timeIntervalSince(lastSent) < Self.batchInterval {
|
|
return false
|
|
}
|
|
|
|
let candidates = context.recentlyVerifiedFingerprints(
|
|
limit: VouchAttestation.maxBatchCount,
|
|
excluding: fingerprint
|
|
)
|
|
var attestations: [VouchAttestation] = []
|
|
for candidate in candidates {
|
|
// Only fingerprints whose announce-bound signing key we know can
|
|
// be anchored to a concrete identity; skip the rest.
|
|
guard let fingerprintData = Data(hexString: candidate),
|
|
fingerprintData.count == VouchAttestation.fingerprintSize,
|
|
let signingKey = context.signingKey(forFingerprint: candidate),
|
|
signingKey.count == VouchAttestation.signingKeySize,
|
|
let attestation = VouchAttestation.build(
|
|
voucheeFingerprint: fingerprintData,
|
|
voucheeSigningKey: signingKey,
|
|
timestampMs: UInt64(now.timeIntervalSince1970 * 1000),
|
|
sign: context.noiseSignData
|
|
) else {
|
|
continue
|
|
}
|
|
attestations.append(attestation)
|
|
}
|
|
|
|
guard !attestations.isEmpty,
|
|
let payload = VouchAttestation.encodeList(attestations) else { return false }
|
|
context.sendVouchAttestations(payload, to: peerID)
|
|
context.markVouchBatchSent(to: fingerprint, at: now)
|
|
SecureLogger.debug(
|
|
"🪪 Sent \(attestations.count) vouch attestation(s) to \(peerID.id.prefix(8))…",
|
|
category: .security
|
|
)
|
|
return true
|
|
}
|
|
|
|
/// Accept policy: process inbound vouches only from a sender I verified,
|
|
/// only with a valid Ed25519 signature under the sender's announce-bound
|
|
/// signing key, and only within the validity window. Self-vouches and
|
|
/// vouches for already-verified peers are dropped by the identity
|
|
/// manager's storage gates.
|
|
func handleVouchPayload(from peerID: PeerID, payload: Data, now: Date = Date()) {
|
|
guard let senderFingerprint = context.getFingerprint(for: peerID),
|
|
context.isVerifiedFingerprint(senderFingerprint) else {
|
|
SecureLogger.debug(
|
|
"🪪 Ignoring vouch payload from unverified peer \(peerID.id.prefix(8))…",
|
|
category: .security
|
|
)
|
|
return
|
|
}
|
|
guard let senderSigningKey = context.signingKey(forFingerprint: senderFingerprint) else {
|
|
SecureLogger.debug(
|
|
"🪪 No signing key for vouching peer \(peerID.id.prefix(8))…; dropping batch",
|
|
category: .security
|
|
)
|
|
return
|
|
}
|
|
|
|
var acceptedCount = 0
|
|
for attestation in VouchAttestation.decodeList(from: payload) {
|
|
guard attestation.verifySignature(voucherSigningKey: senderSigningKey),
|
|
!attestation.isExpired(now: now) else { continue }
|
|
let stored = context.recordVouch(
|
|
voucheeFingerprint: attestation.voucheeFingerprintHex,
|
|
voucherFingerprint: senderFingerprint,
|
|
timestamp: attestation.timestamp
|
|
)
|
|
if stored { acceptedCount += 1 }
|
|
}
|
|
|
|
if acceptedCount > 0 {
|
|
SecureLogger.info(
|
|
"🪪 Accepted \(acceptedCount) vouch(es) from \(senderFingerprint.prefix(8))…",
|
|
category: .security
|
|
)
|
|
context.notifyPeerTrustChanged()
|
|
}
|
|
}
|
|
}
|