Close forged-directness link-rebind DoS on DM routing (#1421)

* Gate connected-link trust on a secure session; deny forged direct announces the connected shortcut

Residual gap after the rotation-heal containment (#1401): "verified
direct" announces prove the signature but not directness — TTL is
unsigned — so a malicious connected peer can replay a victim's fresh
announce with its TTL restored. When the victim has no live link, the
replayer's link rebinds to the victim's ID and reads as "connected",
and MessageRouter's connected fast-path then trusts it outright: every
DM stalls on a Noise handshake the replayer can never complete and is
silently lost while showing "sent".

Router-level trust gate (no wire change):
- Transport gains canDeliverSecurely(to:) — BLE answers with an
  established Noise session; Nostr keeps its prompt-delivery predicate;
  the protocol default forwards to canDeliverPromptly for transports
  without a forgeable link layer.
- MessageRouter.sendPrivate only trusts a connected link outright when
  it can deliver securely; otherwise it still sends (kicking the
  handshake on a genuine link) but retains a copy and hands a sealed
  copy to couriers, like the reachable path. flushOutbox gets the same
  gate so a flush over an insecure link resends instead of dropping the
  retained copy.

Presence hardening (defense in depth): a "direct" announce arriving on
a link already bound to a different peer no longer shortcuts the
claimed peer into "connected" — only real link state does. Genuine
first-contact and direct announces are unaffected; only the ambiguous
heal path loses the forgeable shortcut.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* Harden the insecure-link outbox bound; document the second-replay presence gap and the courier metadata tradeoff

Review follow-ups on the canDeliverSecurely gate:

- flushOutbox no longer counts connected-but-insecure flushes toward the
  maxSendAttempts drop: the message was actually transmitted over a live
  link, so a peer whose Noise handshake stalls across reconnect flapping
  must not burn through the cap and lose the store-and-forward copy the
  gate exists to preserve. Retention stays bounded by the 24h outbox TTL
  and the per-peer FIFO cap; acks still clear it. Attempt-counting stays
  for reachable-only (heuristic) sends. Regression test: >8 connected-
  insecure flushes keep the retained copy, drop callback never fires.

- Document the known second-replay presence gap: linkBoundToOtherPeer
  reads the binding before rebindLinkAfterVerifiedDirectAnnounce steals
  the link, so once a first replay has rebound a link to an absent
  victim's ID, a second replay marks the victim connected. Presence
  display only — DMs stay on the retain+courier path via the router
  gate. Not closed at the announce layer because the post-rebind state
  is indistinguishable from a legitimate rotation/reconnect heal (a
  supported, field-verified flow). Covered by a two-announce test.

- Note the accepted courier-spray metadata tradeoff at the connected-
  insecure send: nearby verified peers receive a sealed copy (they learn
  a DM exists, never its content), cleared on ack.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* Promote a healed rotation to connected; normalize the secure-delivery probe; retain Codable properties in Periphery

Codex review follow-ups on 5017c232:

- P1: a legitimate rotation announce necessarily arrives on a link still
  bound to the OLD peer ID, so the linkBoundToOtherPeer denial stored the
  new identity as disconnected — and the rebind only fixed link state,
  never the registry. A healed rotation then read as disconnected until
  the peer happened to announce again. rebindLinkAfterVerifiedDirect-
  Announce now promotes the rebound identity to connected after the
  containment checks pass (registry markConnected + topology/snapshot/
  peer-list refresh; the .peerConnected UI event already fired from the
  announce path). This consciously moves the forged-presence residue
  from second-replay to first-successful-rebind — bounded by the rebind
  containment (never steals a live identity, one rebind per link per
  cooldown) and still display-only: DMs stay gated on canDeliverSecurely.
  Comments and the pinned tests updated; new regression test covers
  rotate-on-open-link -> rebind -> isPeerConnected(new) == true.

- P2: BLEService.canDeliverSecurely probed the Noise session with the
  peer ID as given, but sessions are keyed by the short wire ID — a send
  keyed by the full 64-hex Noise key (favorites resolution) misread an
  established session as insecure and needlessly retained + couriered
  every DM until ack. Normalize with toShort() like isPeerConnected.
  Test drives a real XX handshake and asserts both ID forms pass.

- Periphery: the PrekeyBundleStore.StoredBundle.noiseKey "assign-only"
  flake fired again and slipped past its baselined USR (read exists in
  loadFromDisk; the indexer intermittently misses it). Replace the
  baseline entry with retain_codable_properties: true — deterministic,
  and a truly-dead Codable field is a persisted-format change anyway.
  Local periphery scan --strict: no unused code detected.

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>
This commit is contained in:
jack
2026-07-09 16:46:33 +02:00
committed by GitHub
co-authored by jack Claude Opus 4.8
parent c8479c15e3
commit b7c6f42b3a
12 changed files with 530 additions and 12 deletions
+72
View File
@@ -674,6 +674,19 @@ final class BLEService: NSObject {
}
}
func canDeliverSecurely(to peerID: PeerID) -> Bool {
// A live link binding alone is forgeable: the rotation heal rebinds a
// link on a signature-verified "direct" announce, but directness rides
// on the unsigned TTL, so a replayed announce can bind an absent
// peer's ID to the replayer's link. An established Noise session
// proves the other end of the link holds the peer's private key.
//
// Sessions are keyed by the short wire ID, so normalize like
// isPeerConnected does a send keyed by the full 64-hex Noise key
// must not misread an established session as insecure.
noiseService.hasEstablishedSession(with: peerID.toShort())
}
func peerNickname(peerID: PeerID) -> String? {
collectionsQueue.sync {
peerRegistry.nickname(for: peerID, connectedOnly: true)
@@ -2083,6 +2096,16 @@ extension BLEService {
}
}
/// Handshake plumbing for tests that need a real established Noise
/// session (e.g. canDeliverSecurely) without Bluetooth in the loop.
func _test_noiseInitiateHandshake(with peerID: PeerID) throws -> Data {
try noiseService.initiateHandshake(with: peerID)
}
func _test_noiseProcessHandshakeMessage(from peerID: PeerID, message: Data) throws -> Data? {
try noiseService.processHandshakeMessage(from: peerID, message: message)
}
static func _test_shouldRediscoverBitChatService(
invalidatedServiceUUIDs: [CBUUID],
cachedServiceUUIDs: [CBUUID]?
@@ -4388,6 +4411,16 @@ extension BLEService {
}
SecureLogger.debug("🔄 Rebinding link after peer-ID rotation: \(previousPeerID.id.prefix(8))… → \(peerID.id.prefix(8))", category: .session)
self.refreshLocalTopology()
// The announce that triggered this rebind was upserted as
// disconnected: the registry ran while the link still belonged
// to the previous ID (the ambiguous state BLEAnnounceHandler
// denies the connected shortcut). The rebind has now
// containment-checked the claim and the identity owns a live
// link, so promote it otherwise a healed rotation leaves a
// live link that reads as disconnected until the next announce.
self.messageQueue.async { [weak self] in
self?.promoteReboundPeerToConnected(peerID)
}
// Retire the rotated-away ID only once its last link is gone; a
// remaining stale link heals the same way or ages out.
guard self.linkStateStore.links(to: previousPeerID).isEmpty else { return }
@@ -4397,6 +4430,26 @@ extension BLEService {
}
}
/// After a successful verified rebind the new identity owns a live link,
/// but its announce was stored disconnected (the link was still bound to
/// the rotated-away ID when the registry upsert ran). Flip it to
/// connected and republish so routing and the peer list see the healed
/// link. The `.peerConnected` UI event already fired from the announce
/// path (new/reconnected + direct), so only list state needs refreshing.
private func promoteReboundPeerToConnected(_ peerID: PeerID) {
let promoted = collectionsQueue.sync(flags: .barrier) {
peerRegistry.markConnected(peerID)
}
guard promoted else { return }
refreshLocalTopology()
publishFullPeerData()
notifyUI { [weak self] in
guard let self else { return }
let currentPeerIDs = self.collectionsQueue.sync { self.peerRegistry.peerIDs }
self.deliverTransportEvent(.peerListUpdated(currentPeerIDs))
}
}
/// Rotation is an implicit leave of the old identity: drop it immediately
/// instead of letting a ghost duplicate linger for the reachability
/// retention window.
@@ -4434,6 +4487,25 @@ extension BLEService {
linkState: { [weak self] peerID in
self?.linkState(for: peerID) ?? (hasPeripheral: false, hasCentral: false)
},
linkBoundToOtherPeer: { [weak self] packet, peerID in
// Reads the CURRENT binding i.e. the state before
// rebindLinkAfterVerifiedDirectAnnounce (which runs after the
// handler) may steal the link and promote the new owner to
// connected. See the caller in BLEAnnounceHandler for why the
// residual forged-presence window this leaves is accepted.
guard let self else { return false }
guard let link = (self.collectionsQueue.sync { self.ingressLinks.link(for: packet) }) else { return false }
let boundPeerID: PeerID? = self.readLinkState { store in
switch link {
case .peripheral(let peripheralUUID):
return store.peerID(forPeripheralID: peripheralUUID)
case .central(let centralUUID):
return store.peerID(forCentralUUID: centralUUID)
}
}
guard let boundPeerID else { return false }
return boundPeerID != peerID
},
withRegistryBarrier: { [weak self] body in
self?.collectionsQueue.sync(flags: .barrier) { body() }
},