mirror of
https://github.com/permissionlesstech/bitchat.git
synced 2026-07-24 21:45:20 +00:00
* Quality pass on the 1.7.0 batch: fix confirmed bugs, bump to 1.7.1 Post-merge review of PRs #1400–#1417 (push-to-talk, mesh bridging, DM store-and-forward, empty-mesh liveliness, geo-notes). Fixes the confirmed, well-scoped findings; deeper architectural/security items are tracked separately. - PTT hot-mic leak: releasing the mic during VoiceCaptureSession.start()'s 150ms retry pause left the mic live and streaming for up to 120s, because cancel() no-op'd once `completed` was set. Bail after the sleep if the hold was released, and make cancel() always tear down a late-started capture. - Bridge courier depositDrop reported success and burned the dedup slot before the drop was actually published (evicted/compose-fail = lying 📦 "carried" with no retry). Only consume publishedDropKeys on durable accept; add BoundedIDSet.remove() to release evicted/failed slots (uses the dead dedupKey). - Blocked senders resurfaced via archived "heard here earlier" echoes, the one path that bypassed the live block filter — filter at seed time. - A late optimistic .sent clobbered the router's .carried state; extend ConversationStore.shouldSkipStatusUpdate to a full precedence guard (sending < sent < carried < delivered < read). - Read receipts were permanently burned when the router dropped them (marked sent then dropped). sendReadReceipt/routeReadReceipt now return Bool; only record as sent on a successful route, else retry on the next read scan. - MessageRouter.cleanupExpiredMessages() had no production caller, so DMs to a peer that never reconnects sat on .sending until relaunch — run it in the 120s bridge sweep. - Sightings tally now rolls over at midnight while idle; wave notification action localized across all 29 locales; bridged anon#tag uses suffix(4) like everything else; makeThrowawayIdentity delegates to NostrIdentity.generate(); .swiftlint.yml excludes .claude worktrees. - Add regression tests: carried→sent no-downgrade, carried→delivered upgrade, evicted pending drop stays retryable. - Bump MARKETING_VERSION to 1.7.1. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> * Fix CI: adjust delivery-status benchmark and drop now-dead addSystemMessage The stricter no-downgrade guard (delivered/carried never regress to sent) broke two things the earlier commit didn't catch locally (perf tests are skipped in the default run, and Periphery runs only in CI): - PerformanceBaselineTests delivery benchmarks alternated sent <-> delivered assuming both directions apply; the delivered -> sent half is now correctly skipped, so the pass measured 0 updates. Alternate two delivered timestamps instead — every update is real, no downgrade. - Routing the geoDM "not in a location channel" error into the thread removed the only caller of ChatPrivateConversationContext.addSystemMessage, leaving it (and its mock) dead per Periphery. Drop the protocol requirement, the mock impl, and the now-vacuous systemMessages.isEmpty assertions (the invariant is compile-time enforced: the context can no longer emit a public system line). Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> * Address review findings: read-receipt dedup, carried-vs-sending, block-time echo purge - Read receipts: claim the receipt in sentReadReceipts synchronously before spawning the routing task (chat open runs two read scans in one MainActor stretch, so the async insert let every unread message route twice), and release the claim when the route fails so the retry-on-failed-route behavior is preserved. - Delivery status: extend the no-downgrade guard so the `.sending` stamp a pre-handshake resend emits can no longer clobber carried/delivered/read (the 📦 indicator survived `.sent` but not `.sending`). - Archived echoes: blocking a peer now purges their carried public messages from the gossip archive at block time (UnifiedPeerService and /block), while the fingerprint-to-peerID mapping is still known — the seed-time filter can't resolve offline non-favorite strangers and stays only as defense-in-depth. New Transport hook (default no-op) + GossipSyncManager.removePublicMessages with immediate persist. - Bridge courier: an envelope that can't encode within the drop size caps fails identically on every attempt; consume the dedup slot so the 120s retry sweep stops re-running Noise sealing on it. - MeshSightingsTracker: cache the day-key DateFormatter instead of building one per call. Tests: double-markAsRead dedup + failed-route retry, carried→sending no-downgrade matrix, block-time purge (manager + service wiring), oversize-drop slot consumption. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Also skip the sent→sending downgrade in the delivery-status guard Codex review follow-up: sendPrivateMessage without an established Noise session emits `.sending` asynchronously, so it can land after the message already reached `.sent` and visibly walk "Sent" back to "Sending...". Treat `.sending` as weaker than `.sent` too — the status was already truthful. `.failed` → `.sending` stays allowed so a retry after a real failure remains visible. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Retain Codable properties in Periphery scan (same fix as #1421) The noiseKey assign-only false positive fired persistently on this branch (twice, including a rerun) despite the baselined USR. Byte-identical to the fix on fix/announce-replay-link-steal so the branches merge cleanly in either order. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: jack <jackjackbits@users.noreply.github.com> Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
316 lines
12 KiB
Swift
316 lines
12 KiB
Swift
//
|
|
// UnifiedPeerServiceTests.swift
|
|
// bitchatTests
|
|
//
|
|
// Tests for UnifiedPeerService fingerprint and block resolution.
|
|
//
|
|
|
|
import Testing
|
|
import Foundation
|
|
import BitFoundation
|
|
@testable import bitchat
|
|
|
|
struct UnifiedPeerServiceTests {
|
|
|
|
@Test @MainActor
|
|
func getFingerprint_prefersMeshService() async {
|
|
let transport = MockTransport()
|
|
let identity = TestIdentityManager()
|
|
let idBridge = NostrIdentityBridge(keychain: MockKeychainHelper())
|
|
let service = UnifiedPeerService(meshService: transport, idBridge: idBridge, identityManager: identity)
|
|
|
|
let peerID = PeerID(str: "00000000000000CC")
|
|
transport.peerFingerprints[peerID] = "fp-1"
|
|
|
|
let fingerprint = service.getFingerprint(for: peerID)
|
|
|
|
#expect(fingerprint == "fp-1")
|
|
}
|
|
|
|
@Test @MainActor
|
|
func isBlocked_usesSocialIdentity() async {
|
|
let transport = MockTransport()
|
|
let identity = TestIdentityManager()
|
|
let idBridge = NostrIdentityBridge(keychain: MockKeychainHelper())
|
|
let service = UnifiedPeerService(meshService: transport, idBridge: idBridge, identityManager: identity)
|
|
|
|
let peerID = PeerID(str: "00000000000000DD")
|
|
let fingerprint = "fp-blocked"
|
|
transport.peerFingerprints[peerID] = fingerprint
|
|
identity.setBlocked(fingerprint, isBlocked: true)
|
|
|
|
#expect(service.isBlocked(peerID))
|
|
}
|
|
|
|
@Test @MainActor
|
|
func setBlocked_persistsByFingerprintAndToggles() async {
|
|
let transport = MockTransport()
|
|
let identity = TestIdentityManager()
|
|
let idBridge = NostrIdentityBridge(keychain: MockKeychainHelper())
|
|
let service = UnifiedPeerService(meshService: transport, idBridge: idBridge, identityManager: identity)
|
|
|
|
let peerID = PeerID(str: "00000000000000EE")
|
|
let fingerprint = "fp-target"
|
|
transport.peerFingerprints[peerID] = fingerprint
|
|
|
|
// Blocking resolves and persists by the peer's fingerprint, and
|
|
// scrubs the peer's carried public messages from the gossip archive
|
|
// while the fingerprint↔peerID mapping is still known (the
|
|
// archived-echo seed filter can't resolve offline strangers).
|
|
let resolved = service.setBlocked(peerID, blocked: true)
|
|
#expect(resolved == fingerprint)
|
|
#expect(identity.isBlocked(fingerprint: fingerprint))
|
|
#expect(service.isBlocked(peerID))
|
|
#expect(transport.purgedArchivePeers == [peerID])
|
|
|
|
// Unblocking clears it against the same identity, without purging.
|
|
let unresolved = service.setBlocked(peerID, blocked: false)
|
|
#expect(unresolved == fingerprint)
|
|
#expect(!identity.isBlocked(fingerprint: fingerprint))
|
|
#expect(!service.isBlocked(peerID))
|
|
#expect(transport.purgedArchivePeers == [peerID])
|
|
}
|
|
|
|
// MARK: - Offline-favorite dedup (updatePeers phase 2)
|
|
|
|
/// A mutual favorite that is also on the mesh must collapse to a single
|
|
/// row keyed by the short mesh ID — even when the announced nickname no
|
|
/// longer matches the one stored with the favorite.
|
|
@Test @MainActor
|
|
func updatePeers_mutualFavoriteOnMeshYieldsSingleRow() async {
|
|
let favoritesService = FavoritesPersistenceService.shared
|
|
|
|
let transport = MockTransport()
|
|
let idBridge = NostrIdentityBridge(keychain: MockKeychainHelper())
|
|
let service = UnifiedPeerService(meshService: transport, idBridge: idBridge, identityManager: TestIdentityManager())
|
|
|
|
let noiseKey = Data(repeating: 0xAB, count: 32)
|
|
favoritesService.addFavorite(peerNoisePublicKey: noiseKey, peerNickname: "alice")
|
|
favoritesService.updatePeerFavoritedUs(peerNoisePublicKey: noiseKey, favorited: true)
|
|
defer {
|
|
favoritesService.updatePeerFavoritedUs(peerNoisePublicKey: noiseKey, favorited: false)
|
|
favoritesService.removeFavorite(peerNoisePublicKey: noiseKey)
|
|
}
|
|
|
|
let meshID = PeerID(publicKey: noiseKey)
|
|
let snapshots = [TransportPeerSnapshot(
|
|
peerID: meshID,
|
|
nickname: "alice-renamed",
|
|
isConnected: true,
|
|
noisePublicKey: noiseKey,
|
|
lastSeen: Date()
|
|
)]
|
|
transport.updatePeerSnapshots(snapshots)
|
|
service.didUpdatePeerSnapshots(snapshots)
|
|
|
|
let rows = service.peers.filter { $0.noisePublicKey == noiseKey }
|
|
#expect(rows.count == 1)
|
|
#expect(rows.first?.peerID == meshID)
|
|
#expect(rows.first?.isMutualFavorite == true)
|
|
#expect(service.favorites.filter { $0.noisePublicKey == noiseKey }.count == 1)
|
|
}
|
|
|
|
/// Same collapse must hold for a reachable-but-not-connected favorite
|
|
/// (relayed peers linger as "reachable" after their link drops).
|
|
@Test @MainActor
|
|
func updatePeers_reachableMutualFavoriteYieldsSingleRow() async {
|
|
let favoritesService = FavoritesPersistenceService.shared
|
|
|
|
let transport = MockTransport()
|
|
let idBridge = NostrIdentityBridge(keychain: MockKeychainHelper())
|
|
let service = UnifiedPeerService(meshService: transport, idBridge: idBridge, identityManager: TestIdentityManager())
|
|
|
|
let noiseKey = Data(repeating: 0xCD, count: 32)
|
|
favoritesService.addFavorite(peerNoisePublicKey: noiseKey, peerNickname: "bob")
|
|
favoritesService.updatePeerFavoritedUs(peerNoisePublicKey: noiseKey, favorited: true)
|
|
defer {
|
|
favoritesService.updatePeerFavoritedUs(peerNoisePublicKey: noiseKey, favorited: false)
|
|
favoritesService.removeFavorite(peerNoisePublicKey: noiseKey)
|
|
}
|
|
|
|
let otherKey = Data(repeating: 0x11, count: 32)
|
|
let snapshots = [
|
|
// A live link is required for anyone to count as reachable.
|
|
TransportPeerSnapshot(
|
|
peerID: PeerID(publicKey: otherKey),
|
|
nickname: "carol",
|
|
isConnected: true,
|
|
noisePublicKey: otherKey,
|
|
lastSeen: Date()
|
|
),
|
|
TransportPeerSnapshot(
|
|
peerID: PeerID(publicKey: noiseKey),
|
|
nickname: "bob",
|
|
isConnected: false,
|
|
noisePublicKey: noiseKey,
|
|
lastSeen: Date()
|
|
)
|
|
]
|
|
transport.updatePeerSnapshots(snapshots)
|
|
service.didUpdatePeerSnapshots(snapshots)
|
|
|
|
let bobRows = service.peers.filter { $0.noisePublicKey == noiseKey }
|
|
#expect(bobRows.count == 1)
|
|
#expect(bobRows.first?.peerID == PeerID(publicKey: noiseKey))
|
|
#expect(bobRows.first?.isReachable == true)
|
|
}
|
|
|
|
/// A mutual favorite with no mesh presence still gets its offline row,
|
|
/// keyed by the full noise-key PeerID.
|
|
@Test @MainActor
|
|
func updatePeers_offlineMutualFavoriteGetsOfflineRow() async {
|
|
let favoritesService = FavoritesPersistenceService.shared
|
|
|
|
let transport = MockTransport()
|
|
let idBridge = NostrIdentityBridge(keychain: MockKeychainHelper())
|
|
let service = UnifiedPeerService(meshService: transport, idBridge: idBridge, identityManager: TestIdentityManager())
|
|
|
|
let noiseKey = Data(repeating: 0xEF, count: 32)
|
|
favoritesService.addFavorite(peerNoisePublicKey: noiseKey, peerNickname: "dave")
|
|
favoritesService.updatePeerFavoritedUs(peerNoisePublicKey: noiseKey, favorited: true)
|
|
defer {
|
|
favoritesService.updatePeerFavoritedUs(peerNoisePublicKey: noiseKey, favorited: false)
|
|
favoritesService.removeFavorite(peerNoisePublicKey: noiseKey)
|
|
}
|
|
|
|
transport.updatePeerSnapshots([])
|
|
service.didUpdatePeerSnapshots([])
|
|
|
|
let rows = service.peers.filter { $0.noisePublicKey == noiseKey }
|
|
#expect(rows.count == 1)
|
|
#expect(rows.first?.peerID == PeerID(hexData: noiseKey))
|
|
#expect(rows.first?.isMutualFavorite == true)
|
|
}
|
|
|
|
@Test @MainActor
|
|
func setBlocked_unknownIdentityReturnsNil() async {
|
|
let transport = MockTransport()
|
|
let identity = TestIdentityManager()
|
|
let idBridge = NostrIdentityBridge(keychain: MockKeychainHelper())
|
|
let service = UnifiedPeerService(meshService: transport, idBridge: idBridge, identityManager: identity)
|
|
|
|
// No fingerprint resolvable for this peer (offline & unknown).
|
|
let peerID = PeerID(str: "00000000000000FF")
|
|
|
|
#expect(service.setBlocked(peerID, blocked: true) == nil)
|
|
#expect(!service.isBlocked(peerID))
|
|
}
|
|
}
|
|
|
|
private final class TestIdentityManager: SecureIdentityStateManagerProtocol {
|
|
private var socialIdentities: [String: SocialIdentity] = [:]
|
|
private var favorites: Set<String> = []
|
|
private var blockedNostr: Set<String> = []
|
|
private var verified: Set<String> = []
|
|
|
|
func forceSave() {}
|
|
|
|
func getSocialIdentity(for fingerprint: String) -> SocialIdentity? {
|
|
socialIdentities[fingerprint]
|
|
}
|
|
|
|
func upsertCryptographicIdentity(fingerprint: String, noisePublicKey: Data, signingPublicKey: Data?, claimedNickname: String?) {}
|
|
|
|
func getCryptoIdentitiesByPeerIDPrefix(_ peerID: PeerID) -> [CryptographicIdentity] {
|
|
[]
|
|
}
|
|
|
|
func updateSocialIdentity(_ identity: SocialIdentity) {
|
|
socialIdentities[identity.fingerprint] = identity
|
|
}
|
|
|
|
func isFavorite(fingerprint: String) -> Bool {
|
|
favorites.contains(fingerprint)
|
|
}
|
|
|
|
func isBlocked(fingerprint: String) -> Bool {
|
|
socialIdentities[fingerprint]?.isBlocked ?? false
|
|
}
|
|
|
|
func setBlocked(_ fingerprint: String, isBlocked: Bool) {
|
|
var identity = socialIdentities[fingerprint] ?? SocialIdentity(
|
|
fingerprint: fingerprint,
|
|
localPetname: nil,
|
|
claimedNickname: "",
|
|
trustLevel: .unknown,
|
|
isFavorite: false,
|
|
isBlocked: false,
|
|
notes: nil
|
|
)
|
|
identity.isBlocked = isBlocked
|
|
socialIdentities[fingerprint] = identity
|
|
}
|
|
|
|
func isNostrBlocked(pubkeyHexLowercased: String) -> Bool {
|
|
blockedNostr.contains(pubkeyHexLowercased)
|
|
}
|
|
|
|
func setNostrBlocked(_ pubkeyHexLowercased: String, isBlocked: Bool) {
|
|
if isBlocked {
|
|
blockedNostr.insert(pubkeyHexLowercased)
|
|
} else {
|
|
blockedNostr.remove(pubkeyHexLowercased)
|
|
}
|
|
}
|
|
|
|
func getBlockedNostrPubkeys() -> Set<String> {
|
|
blockedNostr
|
|
}
|
|
|
|
func registerEphemeralSession(peerID: PeerID, handshakeState: HandshakeState) {}
|
|
|
|
func clearAllIdentityData() {
|
|
socialIdentities.removeAll()
|
|
favorites.removeAll()
|
|
blockedNostr.removeAll()
|
|
verified.removeAll()
|
|
}
|
|
|
|
func removeEphemeralSession(peerID: PeerID) {}
|
|
|
|
func setVerified(fingerprint: String, verified: Bool) {
|
|
if verified {
|
|
self.verified.insert(fingerprint)
|
|
} else {
|
|
self.verified.remove(fingerprint)
|
|
}
|
|
}
|
|
|
|
func isVerified(fingerprint: String) -> Bool {
|
|
verified.contains(fingerprint)
|
|
}
|
|
|
|
func getVerifiedFingerprints() -> Set<String> {
|
|
verified
|
|
}
|
|
|
|
// MARK: Vouching (unused by these tests)
|
|
|
|
@discardableResult
|
|
func recordVouch(voucheeFingerprint: String, voucherFingerprint: String, timestamp: Date) -> Bool {
|
|
false
|
|
}
|
|
|
|
func validVouchers(for fingerprint: String) -> [VouchRecord] {
|
|
[]
|
|
}
|
|
|
|
func isVouched(fingerprint: String) -> Bool {
|
|
false
|
|
}
|
|
|
|
func lastVouchBatchSent(to fingerprint: String) -> Date? {
|
|
nil
|
|
}
|
|
|
|
func markVouchBatchSent(to fingerprint: String, at date: Date) {}
|
|
|
|
func signingPublicKey(forFingerprint fingerprint: String) -> Data? {
|
|
nil
|
|
}
|
|
|
|
func mostRecentlyVerifiedFingerprints(limit: Int, excluding fingerprint: String) -> [String] {
|
|
[]
|
|
}
|
|
}
|