mirror of
https://github.com/permissionlesstech/bitchat.git
synced 2026-07-26 21:25:22 +00:00
Make panic wipe deterministic and device-bound (#1431)
* Make panic wipe deterministic and device-bound * Scope install markers to iOS * Harden panic recovery and service shutdown * Invalidate queued BLE ingress during panic * Harden panic keychain and media cleanup --------- Co-authored-by: jack <jackjackbits@users.noreply.github.com> Co-authored-by: jack <jack@deck.local>
This commit is contained in:
@@ -572,6 +572,108 @@ struct BLEServiceCoreTests {
|
||||
#expect(ble.myPeerID == PeerID(str: newFingerprint.prefix(16)))
|
||||
}
|
||||
|
||||
@Test
|
||||
func panicSuspension_dropsLateOutboundWorkUntilCommit() async {
|
||||
let ble = makeService()
|
||||
let outbound = OutboundPacketTap()
|
||||
ble._test_onOutboundPacket = outbound.record
|
||||
let packet = makePublicPacket(
|
||||
content: "late callback",
|
||||
sender: ble.myPeerID,
|
||||
timestamp: UInt64(Date().timeIntervalSince1970 * 1000)
|
||||
)
|
||||
|
||||
ble.suspendForPanicReset()
|
||||
ble.sendPacket(packet)
|
||||
#expect(outbound.count(ofType: .message) == 0)
|
||||
|
||||
ble.completePanicReset(restartServices: false)
|
||||
ble.sendPacket(packet)
|
||||
#expect(outbound.count(ofType: .message) == 1)
|
||||
}
|
||||
|
||||
@Test @MainActor
|
||||
func panicSuspension_invalidatesQueuedMainActorIngress() async {
|
||||
let ble = makeService()
|
||||
let delegate = TransportEventCaptureDelegate()
|
||||
ble.eventDelegate = delegate
|
||||
let message = BitchatMessage(
|
||||
id: "pre-panic-ingress",
|
||||
sender: "Peer",
|
||||
content: "must not survive panic",
|
||||
timestamp: Date(),
|
||||
isRelay: false,
|
||||
isPrivate: true,
|
||||
recipientNickname: "Me",
|
||||
senderPeerID: PeerID(str: "1122334455667788")
|
||||
)
|
||||
|
||||
// The test already owns MainActor, so this task cannot run until the
|
||||
// synchronous panic boundary below has invalidated its generation.
|
||||
ble._test_emitTransportEvent(.messageReceived(message))
|
||||
ble.suspendForPanicReset()
|
||||
await Task.yield()
|
||||
#expect(delegate.messageIDs.isEmpty)
|
||||
|
||||
ble.completePanicReset(restartServices: false)
|
||||
ble._test_emitTransportEvent(.messageReceived(message))
|
||||
await Task.yield()
|
||||
#expect(delegate.messageIDs == [message.id])
|
||||
}
|
||||
|
||||
@Test @MainActor
|
||||
func panicSuspension_rejectsPausedBLEReceiveBeforeMessageQueueHandoff() async {
|
||||
let ble = makeService()
|
||||
let gate = ReceivePacketHandoffGate()
|
||||
ble._test_beforeReceivePacketHandoff = gate.pause
|
||||
ble._test_onReceivePacketHandoff = gate.recordHandoff
|
||||
defer {
|
||||
gate.release()
|
||||
ble._test_beforeReceivePacketHandoff = nil
|
||||
ble._test_onReceivePacketHandoff = nil
|
||||
}
|
||||
|
||||
let sender = PeerID(str: "1122334455667788")
|
||||
let packet = makePublicPacket(
|
||||
content: "must not cross panic",
|
||||
sender: sender,
|
||||
timestamp: UInt64(Date().timeIntervalSince1970 * 1000)
|
||||
)
|
||||
ble._test_handlePacketFromBLEQueue(packet, fromPeerID: sender)
|
||||
#expect(await TestHelpers.waitUntil(
|
||||
{ gate.hasPaused },
|
||||
timeout: TestConstants.longTimeout
|
||||
))
|
||||
|
||||
// Panic closes the lifecycle before waiting for the paused bleQueue
|
||||
// callback. Releasing it afterward lets the callback enqueue its
|
||||
// messageQueue handoff, where the captured generation must be rejected
|
||||
// before packet processing starts.
|
||||
let panicIngressObserver = PanicIngressObserver(service: ble)
|
||||
let didObservePanicClosure = await withCheckedContinuation { continuation in
|
||||
DispatchQueue.global(qos: .userInitiated).async {
|
||||
let didObserveClosure = panicIngressObserver.waitUntilClosed(
|
||||
timeout: TestConstants.defaultTimeout
|
||||
)
|
||||
gate.release()
|
||||
continuation.resume(returning: didObserveClosure)
|
||||
}
|
||||
ble.suspendForPanicReset()
|
||||
}
|
||||
|
||||
#expect(didObservePanicClosure)
|
||||
#expect(gate.handoffCount == 0)
|
||||
|
||||
// A packet captured under the reopened lifecycle still crosses the
|
||||
// same handoff, proving the test did not merely disable the hook.
|
||||
ble.completePanicReset(restartServices: false)
|
||||
ble._test_handlePacketFromBLEQueue(packet, fromPeerID: sender)
|
||||
#expect(await TestHelpers.waitUntil(
|
||||
{ gate.handoffCount == 1 },
|
||||
timeout: TestConstants.longTimeout
|
||||
))
|
||||
}
|
||||
|
||||
@Test
|
||||
func modifiedServices_rediscoverWhenBitChatServiceIsInvalidated() async throws {
|
||||
let otherService = CBUUID(string: "0000180F-0000-1000-8000-00805F9B34FB")
|
||||
@@ -666,6 +768,68 @@ private final class OutboundPacketTap {
|
||||
}
|
||||
}
|
||||
|
||||
private final class ReceivePacketHandoffGate: @unchecked Sendable {
|
||||
private let condition = NSCondition()
|
||||
private var paused = false
|
||||
private var released = false
|
||||
private var recordedHandoffCount = 0
|
||||
|
||||
var hasPaused: Bool {
|
||||
condition.lock()
|
||||
defer { condition.unlock() }
|
||||
return paused
|
||||
}
|
||||
|
||||
var handoffCount: Int {
|
||||
condition.lock()
|
||||
defer { condition.unlock() }
|
||||
return recordedHandoffCount
|
||||
}
|
||||
|
||||
func pause() {
|
||||
condition.lock()
|
||||
paused = true
|
||||
condition.broadcast()
|
||||
while !released {
|
||||
condition.wait()
|
||||
}
|
||||
condition.unlock()
|
||||
}
|
||||
|
||||
func release() {
|
||||
condition.lock()
|
||||
released = true
|
||||
condition.broadcast()
|
||||
condition.unlock()
|
||||
}
|
||||
|
||||
func recordHandoff() {
|
||||
condition.lock()
|
||||
recordedHandoffCount += 1
|
||||
condition.unlock()
|
||||
}
|
||||
}
|
||||
|
||||
/// Lets a dedicated dispatch worker observe the lock-protected panic gate
|
||||
/// without treating the full BLE service as generally Sendable.
|
||||
private final class PanicIngressObserver: @unchecked Sendable {
|
||||
private let service: BLEService
|
||||
|
||||
init(service: BLEService) {
|
||||
self.service = service
|
||||
}
|
||||
|
||||
func waitUntilClosed(timeout: TimeInterval) -> Bool {
|
||||
let deadline = DispatchTime.now().uptimeNanoseconds
|
||||
+ UInt64(timeout * 1_000_000_000)
|
||||
while service._test_isPanicIngressOpen,
|
||||
DispatchTime.now().uptimeNanoseconds < deadline {
|
||||
Thread.sleep(forTimeInterval: 0.001)
|
||||
}
|
||||
return !service._test_isPanicIngressOpen
|
||||
}
|
||||
}
|
||||
|
||||
private func makeService() -> BLEService {
|
||||
let keychain = MockKeychain()
|
||||
let identityManager = MockIdentityManager(keychain)
|
||||
@@ -724,3 +888,13 @@ private final class PublicCaptureDelegate: BitchatDelegate {
|
||||
return publicMessages
|
||||
}
|
||||
}
|
||||
|
||||
@MainActor
|
||||
private final class TransportEventCaptureDelegate: TransportEventDelegate {
|
||||
private(set) var messageIDs: [String] = []
|
||||
|
||||
func didReceiveTransportEvent(_ event: TransportEvent) {
|
||||
guard case .messageReceived(let message) = event else { return }
|
||||
messageIDs.append(message.id)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user