mirror of
https://github.com/permissionlesstech/bitchat.git
synced 2026-07-26 00:05:20 +00:00
* Friend-courier store-and-forward: mutual favorites carry sealed messages to offline peers When a private message has no reachable transport, the router now seals it to the recipient's Noise static key (new one-way Noise X pattern) and hands the envelope to up to three connected mutual favorites. Couriers store the opaque ciphertext under strict quotas (20 total, 5 per depositor, 16 KiB, 24 h) and hand it over when the recipient's announce matches a rotating HMAC recipient tag; the recipient opens it and the message flows through the normal private-message pipeline, so dedup and delivery acks just work. - CourierEnvelope TLV + courierEnvelope (0x04) message type in BitFoundation - Noise X one-way pattern reusing the existing handshake machinery, domain-separated by a courier prologue; sender identity authenticated via the ss DH (no forward secrecy - documented tradeoff) - CourierStore with eviction, file persistence, and panic-wipe integration - Rotating recipient tags (HMAC over epoch day) so carried envelopes don't correlate for observers who don't already know the recipient's key - New "carried" delivery status with figure.walk glyph; header indicator while carrying mail for others - Three-node end-to-end test ferrying packets through real BLEService instances, plus codec/crypto/store/router suites (986 tests green) Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Fix courier handoff verification and directed sends * Authenticate courier deposits by ingress peer * Gate courier handover on direct announces and isolate store test Envelopes are removed from the courier store optimistically, so releasing them on a relayed (multi-hop) announce risks losing carried mail to a speculative flood that never reaches the recipient. Handover now also requires the announce to have arrived directly (full TTL), i.e. an actual encounter with a live link; regression test builds a relayed copy of a genuinely signed announce (TTL is excluded from announce signatures). Also make CourierStore's on-disk location injectable so the persistence test round-trips through a temp directory instead of wiping the real Application Support store, and reattach BLEAnnounceHandler's doc comment to the class it describes. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Use Xcode-bundled Swift in CI instead of a standalone toolchain The unpinned setup-swift action installs Swift 6.1, which refuses the SDK on runner images that have rolled to Xcode 26.5 ("this SDK is not supported by the compiler"). Jobs passed or failed depending on which image they landed on. The Xcode-bundled toolchain always matches the image's SDK, and matches local development. Cache keys now include the toolchain version so artifacts from one compiler are never restored into builds with another. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Drop couriered mail from blocked senders at envelope open The UI-layer block check (isPeerBlocked in the transport event coordinator) resolves a fingerprint from the live session or peer list, but a couriered message arrives precisely when its sender is absent — no session, no registry entry — so the check failed open and a blocked identity's mail was delivered anyway. Gate in openCourierEnvelope, where the sealed sender's full static key is in hand. End-to-end test ferries a full deposit→carry→handover round and verifies the envelope from a blocked sender never reaches the delegate (confirmed failing without the gate). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Fix favorites end-to-end: peer-list dedup, Nostr sync, /fav key corruption - UnifiedPeerService: dedup offline favorites against mesh peers by noise key. Phase 2 compared a 64-hex noise-key PeerID against 16-hex mesh IDs (never equal), leaving only a nickname+isConnected heuristic — a mutual favorite that was reachable-but-not-connected or renamed rendered twice, and a same-nick stranger could suppress a favorite entirely. - Nostr inbound: intercept [FAVORITED]/[UNFAVORITED] markers in the live PM handler so they update theyFavoritedUs instead of rendering as chat text; mutual favorites can now form over Nostr. Delete the dead favorite-aware PM variant and ChatNostrCoordinator.handleFavoriteNotification (unwired, parsed a stale FAVORITE:TRUE|… format no sender emits). - NostrTransport.isPeerReachable: match short form regardless of incoming ID width — toggling an offline favorite (addressed by 64-hex noise key) was silently dropped with no reachable transport. - BLEService.sendPrivateMessage: normalize recipient to the short ID like sendFilePrivate, so a 64-hex target hits the existing Noise session instead of initiating a handshake with a 32-byte wire recipient ID. - /fav, /unfav: stop writing Data(hexString: peerID.id) — the 8-byte routing ID for mesh peers — into the favorites store as a "noise key", and stop double-sending the favorite notification; delegate to toggleFavorite with a proper state check. - FavoritesPersistenceService.updatePeerFavoritedUs: keep the stored nickname when the caller passes the "Unknown" placeholder. - Bump marketing version to 1.5.4. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Route DMs to mutual favorites via Nostr when a mesh-keyed peer goes offline Field-tested on device: with a DM window opened while the peer was on mesh (conversation keyed by the short 16-hex ID), walking out of range and sending failed instantly with "peer not reachable" even though the header showed the peer as Nostr-reachable (mutual favorite, npub known). sendPrivateMessage derived the favorites key as Data(hexString: peerID.id) — for a short mesh ID that is the 8-byte routing ID, never the noise key — so the mutual-favorite/Nostr-key checks always came up empty and the send failed before reaching MessageRouter. Conversations keyed by the full 64-hex noise-key ID (opened from the offline favorite row) were unaffected, which is why later tests appeared to work. Resolve the noise key properly (peerID.noiseKey, then the unified peer row, then the favorites store by derived short ID) and add a regression test for the mesh-keyed-peer-goes-offline case. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Label Nostr DMs from favorites with their stored nickname Field-tested: a DM delivered over the Nostr fallback rendered as "anon#678e" instead of the sender's name. The inbound handler named the sender via displayNameForNostrPubkey, which only knows geohash-scoped names — even though the pipeline had already resolved the sender's noise key (the conversation is keyed by it). When the conversation key carries a noise key, prefer the favorite's stored nickname; geohash DMs (nostr_ keys) keep the anon geo name. This also stops an inbound Nostr [FAVORITED] from overwriting the stored nickname with the anon fallback, since the same name feeds updatePeerFavoritedUs. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Fix courier path for offline favorites addressed by noise-key IDs Two Codex review findings, both the same ID-width confusion this PR targets, in the courier flow: - CourierDirectory.favoritesBacked resolved recipients only via getFavoriteStatus(forPeerID:), which requires a short 16-hex ID — offline favorites are addressed by the full 64-hex noise-key ID, so attemptCourierDeposit silently bailed for exactly the peers couriers exist to serve. The 64-hex ID now yields its own key directly. - openCourierEnvelope emitted the derived short mesh ID even when the sender has no live mesh identity, landing couriered mail in an unresolvable short-ID thread labeled "Unknown". Absent senders now emit the full noise-key ID so the message joins the stable favorite conversation; present senders keep the live short-ID thread. 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>
220 lines
8.0 KiB
Swift
220 lines
8.0 KiB
Swift
//
|
|
// CourierStore.swift
|
|
// bitchat
|
|
//
|
|
// This is free and unencumbered software released into the public domain.
|
|
// For more information, see <https://unlicense.org>
|
|
//
|
|
|
|
import BitFoundation
|
|
import BitLogger
|
|
import Combine
|
|
import Foundation
|
|
|
|
/// Holds courier envelopes this device is carrying for offline third parties.
|
|
///
|
|
/// Envelopes are opaque ciphertext deposited by mutual favorites; this store
|
|
/// never learns sender, recipient, or content. Strict quotas keep the device
|
|
/// from becoming a public mailbag: bounded count, bounded per-depositor
|
|
/// count, bounded size, and a 24-hour lifetime aligned with the outbox
|
|
/// retention policy. Carried mail is included in the panic wipe.
|
|
final class CourierStore {
|
|
struct StoredEnvelope: Codable, Equatable {
|
|
let recipientTag: Data
|
|
let expiry: UInt64
|
|
let ciphertext: Data
|
|
let depositorNoiseKey: Data
|
|
let storedAt: Date
|
|
|
|
var envelope: CourierEnvelope {
|
|
CourierEnvelope(recipientTag: recipientTag, expiry: expiry, ciphertext: ciphertext)
|
|
}
|
|
}
|
|
|
|
enum Limits {
|
|
static let maxEnvelopes = 20
|
|
static let maxPerDepositor = 5
|
|
/// Slack on top of the 24h lifetime for depositor clock skew.
|
|
static let maxExpirySlack: TimeInterval = 60 * 60
|
|
}
|
|
|
|
static let shared = CourierStore()
|
|
|
|
/// Number of envelopes currently carried, published on the main thread
|
|
/// so the UI can show a "carrying mail" indicator.
|
|
@Published private(set) var carriedCount: Int = 0
|
|
|
|
/// Fast path so hot code (announce handling) can skip tag computation.
|
|
var isEmpty: Bool {
|
|
queue.sync { envelopes.isEmpty }
|
|
}
|
|
|
|
private var envelopes: [StoredEnvelope] = []
|
|
private let queue = DispatchQueue(label: "chat.bitchat.courier.store")
|
|
private let fileURL: URL?
|
|
private let now: () -> Date
|
|
|
|
/// - Parameter fileURL: Overrides the on-disk location (tests). Ignored
|
|
/// when `persistsToDisk` is false.
|
|
init(persistsToDisk: Bool = true, fileURL: URL? = nil, now: @escaping () -> Date = Date.init) {
|
|
self.now = now
|
|
self.fileURL = persistsToDisk ? (fileURL ?? Self.defaultFileURL()) : nil
|
|
loadFromDisk()
|
|
}
|
|
|
|
// MARK: - Depositing (courier side)
|
|
|
|
/// Accept an envelope from a depositor. Returns false when quotas or
|
|
/// validity checks reject it. Trust policy (mutual favorite) is the
|
|
/// caller's responsibility; this store only enforces resource bounds.
|
|
@discardableResult
|
|
func deposit(_ envelope: CourierEnvelope, from depositorNoiseKey: Data) -> Bool {
|
|
let date = now()
|
|
guard envelope.recipientTag.count == CourierEnvelope.tagLength,
|
|
!envelope.ciphertext.isEmpty,
|
|
envelope.ciphertext.count <= CourierEnvelope.maxCiphertextBytes,
|
|
!envelope.isExpired(at: date) else {
|
|
return false
|
|
}
|
|
// Reject expiries beyond the policy lifetime so depositors can't pin
|
|
// storage longer than the outbox would retain the message itself.
|
|
let maxExpiry = date.addingTimeInterval(CourierEnvelope.maxLifetimeSeconds + Limits.maxExpirySlack)
|
|
guard envelope.expiry <= UInt64(maxExpiry.timeIntervalSince1970 * 1000) else {
|
|
return false
|
|
}
|
|
|
|
return queue.sync {
|
|
pruneExpiredLocked(at: date)
|
|
|
|
// Identical ciphertext is the same envelope; accept idempotently.
|
|
if envelopes.contains(where: { $0.ciphertext == envelope.ciphertext }) {
|
|
return true
|
|
}
|
|
guard envelopes.filter({ $0.depositorNoiseKey == depositorNoiseKey }).count < Limits.maxPerDepositor else {
|
|
SecureLogger.debug("📦 Courier deposit rejected: per-depositor quota reached", category: .session)
|
|
return false
|
|
}
|
|
if envelopes.count >= Limits.maxEnvelopes {
|
|
// Oldest-first eviction, matching outbox overflow behavior.
|
|
let evicted = envelopes.removeFirst()
|
|
SecureLogger.debug("📦 Courier store full - evicted envelope stored at \(evicted.storedAt)", category: .session)
|
|
}
|
|
|
|
envelopes.append(StoredEnvelope(
|
|
recipientTag: envelope.recipientTag,
|
|
expiry: envelope.expiry,
|
|
ciphertext: envelope.ciphertext,
|
|
depositorNoiseKey: depositorNoiseKey,
|
|
storedAt: date
|
|
))
|
|
persistLocked()
|
|
return true
|
|
}
|
|
}
|
|
|
|
// MARK: - Handover (on encountering a peer)
|
|
|
|
/// Remove and return all envelopes addressed to the given peer, matching
|
|
/// the rotating recipient tag across adjacent days. Envelopes are removed
|
|
/// optimistically: handover happens over a live link, and the depositor's
|
|
/// outbox still retains the original for direct delivery.
|
|
func takeEnvelopes(for noiseStaticKey: Data) -> [CourierEnvelope] {
|
|
let date = now()
|
|
let candidates = CourierEnvelope.candidateTags(noiseStaticKey: noiseStaticKey, around: date)
|
|
return queue.sync {
|
|
pruneExpiredLocked(at: date)
|
|
let matched = envelopes.filter { candidates.contains($0.recipientTag) }
|
|
guard !matched.isEmpty else { return [] }
|
|
envelopes.removeAll { stored in matched.contains(stored) }
|
|
persistLocked()
|
|
return matched.map(\.envelope)
|
|
}
|
|
}
|
|
|
|
// MARK: - Maintenance
|
|
|
|
func pruneExpired() {
|
|
let date = now()
|
|
queue.sync {
|
|
pruneExpiredLocked(at: date)
|
|
persistLocked()
|
|
}
|
|
}
|
|
|
|
/// Panic wipe: drop all carried mail from memory and disk.
|
|
func wipe() {
|
|
queue.sync {
|
|
envelopes.removeAll()
|
|
if let fileURL {
|
|
try? FileManager.default.removeItem(at: fileURL)
|
|
}
|
|
publishCountLocked()
|
|
}
|
|
}
|
|
|
|
// MARK: - Internals (call only on `queue`)
|
|
|
|
private func pruneExpiredLocked(at date: Date) {
|
|
let before = envelopes.count
|
|
envelopes.removeAll { $0.envelope.isExpired(at: date) }
|
|
if envelopes.count != before {
|
|
SecureLogger.debug("📦 Courier store pruned \(before - envelopes.count) expired envelope(s)", category: .session)
|
|
}
|
|
}
|
|
|
|
private func publishCountLocked() {
|
|
let count = envelopes.count
|
|
DispatchQueue.main.async { [weak self] in
|
|
self?.carriedCount = count
|
|
}
|
|
}
|
|
|
|
private func persistLocked() {
|
|
publishCountLocked()
|
|
guard let fileURL else { return }
|
|
do {
|
|
if envelopes.isEmpty {
|
|
try? FileManager.default.removeItem(at: fileURL)
|
|
return
|
|
}
|
|
try FileManager.default.createDirectory(
|
|
at: fileURL.deletingLastPathComponent(),
|
|
withIntermediateDirectories: true
|
|
)
|
|
let data = try JSONEncoder().encode(envelopes)
|
|
var options: Data.WritingOptions = [.atomic]
|
|
#if os(iOS)
|
|
options.insert(.completeFileProtection)
|
|
#endif
|
|
try data.write(to: fileURL, options: options)
|
|
} catch {
|
|
SecureLogger.error("Failed to persist courier store: \(error)", category: .session)
|
|
}
|
|
}
|
|
|
|
private func loadFromDisk() {
|
|
guard let fileURL else { return }
|
|
queue.sync {
|
|
guard let data = try? Data(contentsOf: fileURL),
|
|
let stored = try? JSONDecoder().decode([StoredEnvelope].self, from: data) else {
|
|
return
|
|
}
|
|
envelopes = stored
|
|
pruneExpiredLocked(at: now())
|
|
publishCountLocked()
|
|
}
|
|
}
|
|
|
|
private static func defaultFileURL() -> URL? {
|
|
guard let base = try? FileManager.default.url(
|
|
for: .applicationSupportDirectory,
|
|
in: .userDomainMask,
|
|
appropriateFor: nil,
|
|
create: true
|
|
) else { return nil }
|
|
return base
|
|
.appendingPathComponent("courier", isDirectory: true)
|
|
.appendingPathComponent("envelopes.json")
|
|
}
|
|
}
|