mirror of
https://github.com/permissionlesstech/bitchat.git
synced 2026-07-25 02:05:19 +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> * Prekey bundles: forward-secret async first contact for courier mail Courier envelopes were sealed with one-way Noise X to the recipient's long-lived static key, so a later compromise of that key exposed every envelope captured in transit. This adds one-time prekey bundles: - PrekeyBundle (MessageType 0x24): 8 one-time Curve25519 public prekeys bound to the owner's Noise static key by an Ed25519 signature over "bitchat-prekey-bundle-v1" canonical bytes; gossiped mesh-wide on its own 60s sync round (SyncTypeFlags bit 9, 200-peer cap, 24h freshness) and verified against the announce-bound signing key before caching. - Sealed envelope v2: Noise X where the responder static is the one-time prekey, prologue "bitchat-prekey-v1" || prekeyID. Sender identity rides encrypted inside and is authenticated exactly like v1 (blocked-sender check included). CourierEnvelope gains an optional prekeyID TLV that v1 decoders skip as unknown. - Local prekeys live in the Keychain; consumed privates survive a 48h grace window for spray-and-wait redeliveries, then are deleted (the forward-secrecy clock starts at deletion). The batch tops back up and re-gossips when unconsumed count drops below 3, and everything is wiped in panic mode. - Routing: courier sealing picks a cached verified bundle when one exists (one prekey per message, reused across deposit retries), with the advertised .prekeys capability as a veto for on-mesh peers, and falls back to static sealing otherwise. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Prekeys: authenticate bundle packets, fix consume-republish, deflake CI Fixes the prekey-bundle PR review + CI failure: - CI root cause: the receive queue (mesh.message) is concurrent, so a gossiped prekey bundle can be processed before the announce that binds its owner's signing key. The old handler dropped such bundles outright, so under CI parallel load the bundle was permanently lost and the cache/gossip tests flaked (verifiedBundleEntersGossipStore, prekeySealedMailTravelsViaCourierAndOpens). Bundles that arrive before their binding are now retained per-owner (bounded) and re-attempted when the verified announce lands, atomically to avoid a check-then-act race. - Authenticate the OUTER prekey-bundle packet (Codex P2 / review MEDIUM): require senderID == PeerID(bundle.noiseStaticPublicKey) and verify the packet's Ed25519 signature (covers senderID + timestamp) against the owner's bound signing key, in addition to the inner bundle signature. Stops replay under a fresh timestamp / fake senderID. - Key the gossip prekey-bundle store/dedup by the bundle's authenticated identity (noiseStaticPublicKey), not the unauthenticated packet senderID, so one valid bundle sprayed under many fabricated sender IDs can't multiply entries and exhaust the 200-owner cap. - Bump published-bundle generatedAt strictly on consume (Codex P1): consuming a prekey shrinks the published bundle, so it now republishes with a strictly newer generatedAt and re-gossips, so peers replace the cached copy and stop assigning the consumed ID before its 48h grace. - Guard the panic/clear detached Application Support tree-deletes behind TestEnvironment.isRunningTests: the SPM test process shares that tree, so the wipe could land mid-test and flake file-dependent tests. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Update sync tests for prekeyBundle as bit 9 / default sync round Prekeys makes bit 9 (prekeyBundle) a known SyncTypeFlags bit and enables a prekey sync round by default. That broke tests authored by other PRs that assumed bit 9 was phantom or that only their own sync round fires: - SyncTypeFlags(Board)Tests: move the "unknown bits" probes to bits 10+ (0xFE -> 0xFC / 0xFD), since bit 9 is now assigned. - GossipSync(Board)Tests + GossipSyncManagerTests: disable the prekey sync round in configs that run maintenance (as they already do for message/ fragment/fileTransfer), so they isolate the behavior under test. Full app suite (1301 tests) green locally via SPM. 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>
145 lines
5.5 KiB
Swift
145 lines
5.5 KiB
Swift
import BitFoundation
|
|
import Foundation
|
|
|
|
/// Bitfield describing which message types are covered by a REQUEST_SYNC round.
|
|
/// Matches the Android mapping (bit index -> message type).
|
|
struct SyncTypeFlags: OptionSet {
|
|
let rawValue: UInt64
|
|
|
|
init(rawValue: UInt64) {
|
|
// Drop any bit that doesn't map to a known message type. Wire data can
|
|
// carry up to 8 bytes of flags; without this mask, bits with no type
|
|
// (a truncated/garbled field, or a type a newer peer added) would live
|
|
// in the set as phantom membership that no `contains` check matches and
|
|
// `toData` re-serializes — a meaningless "accepted but does nothing"
|
|
// state. Masking here keeps every instance normalized at the source.
|
|
self.rawValue = rawValue & SyncTypeFlags.knownTypeMask
|
|
}
|
|
|
|
/// Union of every bit that maps to a message type. Derived from the
|
|
/// bit↔type table so it tracks automatically when a type is added.
|
|
private static let knownTypeMask: UInt64 = {
|
|
var mask: UInt64 = 0
|
|
for bit in 0..<64 where SyncTypeFlags.type(forBit: bit) != nil {
|
|
mask |= (1 << UInt64(bit))
|
|
}
|
|
return mask
|
|
}()
|
|
|
|
private static func bitIndex(for type: MessageType) -> Int? {
|
|
switch type {
|
|
case .announce: return 0
|
|
case .message: return 1
|
|
case .leave: return 2
|
|
case .noiseHandshake: return 3
|
|
case .noiseEncrypted: return 4
|
|
case .fragment: return 5
|
|
case .requestSync: return 6
|
|
case .fileTransfer: return 7
|
|
case .boardPost: return 8
|
|
// Courier envelopes are directed deposits between trusted peers and
|
|
// must never spread via gossip sync.
|
|
case .courierEnvelope: return nil
|
|
// Ping/pong are ephemeral directed probes; replaying them via gossip
|
|
// sync would only produce stale, unanswerable echoes.
|
|
case .ping, .pong: return nil
|
|
// Gateway carriers are ephemeral live traffic (uplinks are directed,
|
|
// downlinks are rate-budgeted rebroadcasts); replaying them via sync
|
|
// would waste airtime and extend their lifetime.
|
|
case .nostrCarrier: return nil
|
|
// Prekey bundles gossip like board posts. The bitfield is a
|
|
// wire-tolerant little-endian UInt64 (1-8 bytes, unknown high bits
|
|
// ignored by `type(forBit:)`), so bits 8+ need no format change: old
|
|
// clients decode the wider flags and simply never match the new bits.
|
|
case .prekeyBundle: return 9
|
|
}
|
|
}
|
|
|
|
private static func type(forBit index: Int) -> MessageType? {
|
|
switch index {
|
|
case 0: return .announce
|
|
case 1: return .message
|
|
case 2: return .leave
|
|
case 3: return .noiseHandshake
|
|
case 4: return .noiseEncrypted
|
|
case 5: return .fragment
|
|
case 6: return .requestSync
|
|
case 7: return .fileTransfer
|
|
// Bit 8 spills the encoded bitfield into a second byte. Decoders since
|
|
// type-aware sync (#853) accept 1-8 bytes and map unknown bits to no
|
|
// known type, so old clients ignore board rounds instead of choking.
|
|
case 8: return .boardPost
|
|
case 9: return .prekeyBundle
|
|
default:
|
|
return nil
|
|
}
|
|
}
|
|
|
|
static let announce = SyncTypeFlags(messageTypes: [.announce])
|
|
static let message = SyncTypeFlags(messageTypes: [.message])
|
|
static let fragment = SyncTypeFlags(messageTypes: [.fragment])
|
|
static let fileTransfer = SyncTypeFlags(messageTypes: [.fileTransfer])
|
|
static let board = SyncTypeFlags(messageTypes: [.boardPost])
|
|
static let prekeyBundle = SyncTypeFlags(messageTypes: [.prekeyBundle])
|
|
|
|
static let publicMessages = SyncTypeFlags(messageTypes: [.announce, .message])
|
|
|
|
init(messageTypes: [MessageType]) {
|
|
var raw: UInt64 = 0
|
|
for type in messageTypes {
|
|
guard let bit = SyncTypeFlags.bitIndex(for: type) else { continue }
|
|
raw |= (1 << UInt64(bit))
|
|
}
|
|
self.init(rawValue: raw)
|
|
}
|
|
|
|
func contains(_ type: MessageType) -> Bool {
|
|
guard let bit = SyncTypeFlags.bitIndex(for: type) else { return false }
|
|
return contains(SyncTypeFlags(rawValue: 1 << UInt64(bit)))
|
|
}
|
|
|
|
func union(_ other: SyncTypeFlags) -> SyncTypeFlags {
|
|
SyncTypeFlags(rawValue: rawValue | other.rawValue)
|
|
}
|
|
|
|
func intersection(_ other: SyncTypeFlags) -> SyncTypeFlags {
|
|
SyncTypeFlags(rawValue: rawValue & other.rawValue)
|
|
}
|
|
|
|
func toMessageTypes() -> [MessageType] {
|
|
guard rawValue != 0 else { return [] }
|
|
var types: [MessageType] = []
|
|
for bit in 0..<64 {
|
|
guard (rawValue & (1 << UInt64(bit))) != 0 else { continue }
|
|
if let type = SyncTypeFlags.type(forBit: bit) {
|
|
types.append(type)
|
|
}
|
|
}
|
|
return types
|
|
}
|
|
|
|
func toData() -> Data? {
|
|
guard rawValue != 0 else { return nil }
|
|
var value = rawValue
|
|
var bytes: [UInt8] = []
|
|
while value > 0 && bytes.count < 8 {
|
|
bytes.append(UInt8(value & 0xFF))
|
|
value >>= 8
|
|
}
|
|
while let last = bytes.last, last == 0 {
|
|
bytes.removeLast()
|
|
}
|
|
guard !bytes.isEmpty, bytes.count <= 8 else { return nil }
|
|
return Data(bytes)
|
|
}
|
|
|
|
static func decode(_ data: Data) -> SyncTypeFlags? {
|
|
guard (1...8).contains(data.count) else { return nil }
|
|
var raw: UInt64 = 0
|
|
for (index, byte) in data.enumerated() {
|
|
raw |= UInt64(byte) << UInt64(index * 8)
|
|
}
|
|
return SyncTypeFlags(rawValue: raw)
|
|
}
|
|
}
|