mirror of
https://github.com/permissionlesstech/bitchat.git
synced 2026-07-25 11:25:20 +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>
263 lines
15 KiB
Swift
263 lines
15 KiB
Swift
import SwiftUI
|
|
import BitFoundation
|
|
|
|
struct MeshPeerList: View {
|
|
@EnvironmentObject private var peerListModel: PeerListModel
|
|
@ThemedPalette private var palette
|
|
let onTapPeer: (PeerID) -> Void
|
|
let onToggleFavorite: (PeerID) -> Void
|
|
let onShowFingerprint: (PeerID) -> Void
|
|
/// Optional so existing call sites (and previews/tests) keep compiling;
|
|
/// when absent the block/unblock context-menu entry is hidden.
|
|
var onToggleBlock: ((MeshPeerRow) -> Void)? = nil
|
|
@Environment(\.colorScheme) var colorScheme
|
|
|
|
@State private var orderedIDs: [String] = []
|
|
|
|
private enum Strings {
|
|
static let noneNearby: LocalizedStringKey = "geohash_people.none_nearby"
|
|
static let blockedTooltip = String(localized: "geohash_people.tooltip.blocked", comment: "Tooltip shown next to a blocked peer indicator")
|
|
static let newMessagesTooltip = String(localized: "mesh_peers.tooltip.new_messages", comment: "Tooltip for the unread messages indicator")
|
|
static let connected = String(localized: "content.accessibility.connected_mesh", comment: "Accessibility label for mesh-connected peer indicator")
|
|
static let reachable = String(localized: "content.accessibility.reachable_mesh", comment: "Accessibility label for mesh-reachable peer indicator")
|
|
static let nostr = String(localized: "content.accessibility.available_nostr", comment: "Accessibility label for Nostr-available peer indicator")
|
|
static let offline = String(localized: "mesh_peers.state.offline", comment: "State label for a peer that is not currently reachable")
|
|
static let favorite = String(localized: "mesh_peers.state.favorite", comment: "State label for a favorited peer")
|
|
static let unread = String(localized: "mesh_peers.state.unread", comment: "State label for a peer with unread private messages")
|
|
static let blocked = String(localized: "mesh_peers.state.blocked", comment: "State label for a blocked peer")
|
|
static let vouched = String(localized: "mesh_peers.state.vouched", comment: "State label for a peer vouched for by someone the user verified")
|
|
static let vouchedTooltip = String(localized: "mesh_peers.tooltip.vouched", comment: "Tooltip for the vouched (unfilled seal) badge next to a peer")
|
|
static let addFavorite = String(localized: "content.accessibility.add_favorite", comment: "Accessibility label to add a favorite")
|
|
static let removeFavorite = String(localized: "content.accessibility.remove_favorite", comment: "Accessibility label to remove a favorite")
|
|
static let showFingerprint = String(localized: "mesh_peers.action.fingerprint", comment: "Context menu action that shows a peer's fingerprint/verification screen")
|
|
static let openDMHint = String(localized: "mesh_peers.accessibility.open_dm_hint", comment: "Accessibility hint on a peer row explaining activation opens a private chat")
|
|
static let directMessage = String(localized: "content.actions.direct_message", comment: "Action that opens a private chat with the person")
|
|
static let block = String(localized: "geohash_people.action.block", comment: "Context menu action to block a person")
|
|
static let unblock = String(localized: "geohash_people.action.unblock", comment: "Context menu action to unblock a person")
|
|
}
|
|
|
|
var body: some View {
|
|
let currentIDs = peerListModel.meshRows.map(\.id)
|
|
let displayIDs = orderedIDs.filter { currentIDs.contains($0) } + currentIDs.filter { !orderedIDs.contains($0) }
|
|
let peers: [MeshPeerRow] = displayIDs.compactMap { id in
|
|
peerListModel.meshRows.first(where: { $0.id == id })
|
|
}
|
|
|
|
if peerListModel.meshRows.isEmpty {
|
|
VStack(alignment: .leading, spacing: 0) {
|
|
Text(Strings.noneNearby)
|
|
.bitchatFont(size: 14)
|
|
.foregroundColor(palette.secondary)
|
|
.padding(.horizontal)
|
|
.padding(.top, 12)
|
|
}
|
|
} else {
|
|
VStack(alignment: .leading, spacing: 0) {
|
|
ForEach(0..<peers.count, id: \.self) { idx in
|
|
let peer = peers[idx]
|
|
let isMe = peer.isMe
|
|
HStack(spacing: 4) {
|
|
let assigned = peerListModel.colorForMeshPeer(id: peer.peerID, isDark: colorScheme == .dark)
|
|
let baseColor = isMe ? Color.orange : assigned
|
|
if isMe {
|
|
Image(systemName: "person.fill")
|
|
.font(.bitchatSystem(size: 10))
|
|
.foregroundColor(baseColor)
|
|
} else if peer.isConnected {
|
|
// Mesh-connected peer: radio icon
|
|
Image(systemName: "antenna.radiowaves.left.and.right")
|
|
.font(.bitchatSystem(size: 10))
|
|
.foregroundColor(baseColor)
|
|
.help(Strings.connected)
|
|
} else if peer.isReachable {
|
|
// Mesh-reachable (relayed): point.3 icon
|
|
Image(systemName: "point.3.filled.connected.trianglepath.dotted")
|
|
.font(.bitchatSystem(size: 10))
|
|
.foregroundColor(baseColor)
|
|
.help(Strings.reachable)
|
|
} else if peer.isMutualFavorite {
|
|
// Mutual favorite reachable via Nostr: globe icon (purple)
|
|
Image(systemName: "globe")
|
|
.font(.bitchatSystem(size: 10))
|
|
.foregroundColor(.purple)
|
|
.help(Strings.nostr)
|
|
} else {
|
|
// Fallback icon for others (dimmed)
|
|
Image(systemName: "person")
|
|
.font(.bitchatSystem(size: 10))
|
|
.foregroundColor(palette.secondary)
|
|
.help(Strings.offline)
|
|
}
|
|
|
|
let (base, suffix) = peer.displayName.splitSuffix()
|
|
HStack(spacing: 0) {
|
|
Text(base)
|
|
.bitchatFont(size: 14)
|
|
.foregroundColor(baseColor)
|
|
.lineLimit(1)
|
|
.truncationMode(.tail)
|
|
if !suffix.isEmpty {
|
|
let suffixColor = isMe ? Color.orange.opacity(0.6) : baseColor.opacity(0.6)
|
|
Text(suffix)
|
|
.bitchatFont(size: 14)
|
|
.foregroundColor(suffixColor)
|
|
}
|
|
}
|
|
|
|
if peer.isBlocked {
|
|
Image(systemName: "nosign")
|
|
.font(.bitchatSystem(size: 10))
|
|
.foregroundColor(.red)
|
|
.help(Strings.blockedTooltip)
|
|
}
|
|
|
|
if !isMe {
|
|
if peer.isConnected {
|
|
if let icon = peer.encryptionStatus.icon {
|
|
Image(systemName: icon)
|
|
.font(.bitchatSystem(size: 10))
|
|
// Optical centering: lock glyph ink is
|
|
// bottom-heavy, so geometric centering
|
|
// reads low next to the name.
|
|
.offset(y: icon.hasPrefix("lock") ? -0.5 : 0)
|
|
.foregroundColor(baseColor)
|
|
}
|
|
} else {
|
|
// Offline: prefer showing verified badge from persisted fingerprints
|
|
if peer.showsVerifiedBadgeWhenOffline {
|
|
Image(systemName: "checkmark.seal.fill")
|
|
.font(.bitchatSystem(size: 10))
|
|
.foregroundColor(baseColor)
|
|
} else if let icon = peer.encryptionStatus.icon {
|
|
// Fallback to whatever status says (likely lock if we had a past session)
|
|
Image(systemName: icon)
|
|
.font(.bitchatSystem(size: 10))
|
|
.offset(y: icon.hasPrefix("lock") ? -0.5 : 0)
|
|
.foregroundColor(baseColor)
|
|
}
|
|
}
|
|
|
|
// Vouched (transitively verified): unfilled seal,
|
|
// deliberately distinct from verified's filled one.
|
|
// Never shown alongside a verified badge.
|
|
if peer.showsVouchedBadge {
|
|
Image(systemName: "checkmark.seal")
|
|
.font(.bitchatSystem(size: 10))
|
|
.foregroundColor(baseColor)
|
|
.help(Strings.vouchedTooltip)
|
|
}
|
|
}
|
|
|
|
Spacer()
|
|
|
|
// Unread message indicator for this peer
|
|
if peer.hasUnread {
|
|
Image(systemName: "envelope.fill")
|
|
.font(.bitchatSystem(size: 10))
|
|
.foregroundColor(.orange)
|
|
.help(Strings.newMessagesTooltip)
|
|
}
|
|
|
|
if !isMe {
|
|
Button(action: { onToggleFavorite(peer.peerID) }) {
|
|
Image(systemName: peer.isFavorite ? "star.fill" : "star")
|
|
.font(.bitchatSystem(size: 12))
|
|
.foregroundColor(peer.isFavorite ? .yellow : palette.secondary)
|
|
// Widen the tap target beyond the bare glyph;
|
|
// height stays row-bound so neighboring rows
|
|
// keep their own taps.
|
|
.frame(width: 36)
|
|
.contentShape(Rectangle())
|
|
}
|
|
.buttonStyle(.plain)
|
|
}
|
|
}
|
|
.padding(.horizontal)
|
|
.padding(.vertical, 4)
|
|
.padding(.top, idx == 0 ? 10 : 0)
|
|
.contentShape(Rectangle())
|
|
// count:2 must attach before count:1 or the single tap
|
|
// shadows it (same ordering the header logo relies on).
|
|
.onTapGesture(count: 2) { if !isMe { onShowFingerprint(peer.peerID) } }
|
|
.onTapGesture { if !isMe { onTapPeer(peer.peerID) } }
|
|
.contextMenu {
|
|
if !isMe {
|
|
Button(Strings.directMessage) {
|
|
onTapPeer(peer.peerID)
|
|
}
|
|
Button(peer.isFavorite ? Strings.removeFavorite : Strings.addFavorite) {
|
|
onToggleFavorite(peer.peerID)
|
|
}
|
|
Button(Strings.showFingerprint) {
|
|
onShowFingerprint(peer.peerID)
|
|
}
|
|
if let onToggleBlock {
|
|
if peer.isBlocked {
|
|
Button(Strings.unblock) {
|
|
onToggleBlock(peer)
|
|
}
|
|
} else {
|
|
Button(Strings.block, role: .destructive) {
|
|
onToggleBlock(peer)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
.accessibilityElement(children: .ignore)
|
|
.accessibilityLabel(accessibilityDescription(for: peer))
|
|
.accessibilityAddTraits(isMe ? [] : .isButton)
|
|
.accessibilityHint(isMe ? "" : Strings.openDMHint)
|
|
.accessibilityActions {
|
|
if !isMe {
|
|
Button(peer.isFavorite ? Strings.removeFavorite : Strings.addFavorite) {
|
|
onToggleFavorite(peer.peerID)
|
|
}
|
|
Button(Strings.showFingerprint) {
|
|
onShowFingerprint(peer.peerID)
|
|
}
|
|
if let onToggleBlock {
|
|
Button(peer.isBlocked ? Strings.unblock : Strings.block) {
|
|
onToggleBlock(peer)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
// Seed and update order outside result builder
|
|
.onAppear {
|
|
orderedIDs = currentIDs
|
|
}
|
|
.onChange(of: currentIDs) { ids in
|
|
var newOrder = orderedIDs
|
|
newOrder.removeAll { !ids.contains($0) }
|
|
for id in ids where !newOrder.contains(id) { newOrder.append(id) }
|
|
if newOrder != orderedIDs { orderedIDs = newOrder }
|
|
}
|
|
}
|
|
}
|
|
|
|
/// One spoken sentence per row: name, how they're reachable, and any
|
|
/// state badges — the visual row is icon soup for VoiceOver otherwise.
|
|
private func accessibilityDescription(for peer: MeshPeerRow) -> String {
|
|
var parts: [String] = [peer.displayName]
|
|
if !peer.isMe {
|
|
if peer.isConnected {
|
|
parts.append(Strings.connected)
|
|
} else if peer.isReachable {
|
|
parts.append(Strings.reachable)
|
|
} else if peer.isMutualFavorite {
|
|
parts.append(Strings.nostr)
|
|
} else {
|
|
parts.append(Strings.offline)
|
|
}
|
|
}
|
|
if peer.showsVouchedBadge { parts.append(Strings.vouched) }
|
|
if peer.isFavorite { parts.append(Strings.favorite) }
|
|
if peer.hasUnread { parts.append(Strings.unread) }
|
|
if peer.isBlocked { parts.append(Strings.blocked) }
|
|
return parts.joined(separator: ", ")
|
|
}
|
|
}
|