mirror of
https://github.com/permissionlesstech/bitchat.git
synced 2026-07-25 06:05:20 +00:00
Address two review findings on the Tor egress self-check: 1. Bypass on the already-bootstrapped path: shouldWaitForTorBeforeConnecting only checked torIsReady, so once Tor was up, connectToRelays/connectToRelay (initial connect, reconnect backoff timers, manual retry, subscription- triggered connects) opened relay WebSockets without ever running the egress canary. The gate now also requires a fresh cached egress verification (TorManager.isEgressVerified, backed by a nonisolated TTL snapshot on TorEgressVerifier); any path lacking one queues behind awaitEgressReady(). 2. unreachable canary no longer allows: an unreachable canary is exactly the ambiguous case where we cannot tell whether the platform honored the SOCKS proxy, so it now refuses relay connections (fail-closed) instead of allow-with-warning. A verifiedTor verdict still allows connection opens for its 300s TTL (a cached good verdict covers brief canary blips); after TTL expiry or invalidate() (Tor restart/dormant/shutdown) connections stay closed until a probe succeeds again. Probe cadence stays bounded via the verifier's minRetryInterval, and the relay manager schedules a bounded 30s-cadence gate retry after wait-attempt exhaustion so a transient canary outage recovers automatically (GeoRelayDirectory already retries with its own backoff). Tests: verifier policy (unreachable refuses, recovery via retry, cached- within-TTL allows during blip, TTL expiry + unreachable refuses, snapshot invalidation) and relay-manager gating (ready path awaits egress verification, reconnect requeues behind the gate, exhaustion schedules the bounded retry and recovers). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
229 lines
9.9 KiB
Swift
229 lines
9.9 KiB
Swift
import BitLogger
|
|
import Foundation
|
|
|
|
/// Runtime self-check that the proxied `URLSession` egress is *actually* routed
|
|
/// through Tor — defense-in-depth for the case where a platform silently ignores
|
|
/// `URLSessionConfiguration.connectionProxyDictionary` SOCKS settings and lets
|
|
/// traffic egress directly (leaking the real IP while Tor appears enabled).
|
|
///
|
|
/// Runtime verification (see `scripts/tor-egress-verification/`) showed that
|
|
/// macOS and the iOS simulator DO honor the SOCKS proxy for both plain HTTPS and
|
|
/// `URLSessionWebSocketTask`, and that the proxied session is fail-closed (every
|
|
/// request errors when the SOCKS proxy is down). Apple does not officially
|
|
/// support SOCKS for URLSession on iOS, so on a physical device the behavior is
|
|
/// not contractually guaranteed. This verifier closes that gap: before relay
|
|
/// connections are opened under enforced Tor, it performs a canary request whose
|
|
/// response positively reports whether the egress hit the network via Tor.
|
|
///
|
|
/// Policy (`verify()` return value) — fail-closed on unverified egress:
|
|
/// - `.verifiedTor` → allow, and cache the positive result for `ttl`.
|
|
/// - `.notTor` → REFUSE, and drop any cached verification. The canary
|
|
/// reached the internet but the exit is NOT a Tor node:
|
|
/// a real leak. Never allow relays.
|
|
/// - `.unreachable` → REFUSE (egress unverified). The canary itself failed
|
|
/// (endpoint down / circuit not built), so we cannot tell
|
|
/// whether the platform honored the SOCKS proxy — the
|
|
/// exact ambiguity this verifier exists to resolve.
|
|
/// Unverified traffic must not proceed on the
|
|
/// enforced-Tor path.
|
|
///
|
|
/// TTL / retry semantics:
|
|
/// - A `verifiedTor` verdict allows connection *opens* for `ttl` without
|
|
/// re-probing, so a brief canary blip inside the TTL window does not take
|
|
/// relays offline (a fresh positive verdict is authoritative for the
|
|
/// window). Already-open sockets are never torn down by verification —
|
|
/// they were opened under a verified egress and the proxied session is
|
|
/// fail-closed by construction.
|
|
/// - After TTL expiry (or `invalidate()` on Tor restart/dormant/shutdown),
|
|
/// the next `verify()` re-probes; while the canary stays `.unreachable`,
|
|
/// new connection opens are refused until a probe succeeds again.
|
|
/// - Probe cadence is bounded: at most one probe per `minRetryInterval`
|
|
/// (callers within the window reuse the last decision), and concurrent
|
|
/// `verify()` calls share one in-flight probe. Recovery from a transient
|
|
/// canary outage is automatic: callers that keep retrying (relay connect
|
|
/// gate, GeoRelayDirectory backoff) re-probe and succeed once the canary
|
|
/// is reachable again.
|
|
///
|
|
/// The probe is injectable so the policy/caching logic is unit-tested without a
|
|
/// live network (see `TorEgressVerifierTests`).
|
|
public actor TorEgressVerifier {
|
|
public enum ProbeResult: Equatable, Sendable {
|
|
/// Canary succeeded and the exit is a Tor node.
|
|
case verifiedTor
|
|
/// Canary succeeded but the exit is NOT Tor — a direct-egress leak.
|
|
case notTor
|
|
/// Canary could not complete (endpoint down, no circuit, parse error).
|
|
case unreachable(String)
|
|
}
|
|
|
|
private let probe: @Sendable () async -> ProbeResult
|
|
private let now: @Sendable () -> Date
|
|
private let ttl: TimeInterval
|
|
/// Minimum spacing between probes when not currently verified, so a
|
|
/// persistent `.unreachable` cannot hammer the canary endpoint on every
|
|
/// reconnect burst.
|
|
private let minRetryInterval: TimeInterval
|
|
|
|
private var lastVerifiedAt: Date?
|
|
private var lastProbeAt: Date?
|
|
private var lastResult: ProbeResult?
|
|
private var inFlight: Task<Bool, Never>?
|
|
|
|
/// Lock-protected mirror of "verified within TTL" so synchronous gates
|
|
/// (e.g. `NostrRelayManager`'s connect path) can consult the cache without
|
|
/// awaiting the actor.
|
|
private let verifiedSnapshot = VerifiedSnapshot()
|
|
|
|
private final class VerifiedSnapshot: @unchecked Sendable {
|
|
private let lock = NSLock()
|
|
private var verifiedUntil: Date?
|
|
|
|
func update(_ until: Date?) {
|
|
lock.lock()
|
|
verifiedUntil = until
|
|
lock.unlock()
|
|
}
|
|
|
|
func isFresh(at date: Date) -> Bool {
|
|
lock.lock()
|
|
defer { lock.unlock() }
|
|
guard let verifiedUntil else { return false }
|
|
return date < verifiedUntil
|
|
}
|
|
}
|
|
|
|
public init(
|
|
ttl: TimeInterval,
|
|
minRetryInterval: TimeInterval = 5.0,
|
|
now: @escaping @Sendable () -> Date = Date.init,
|
|
probe: @escaping @Sendable () async -> ProbeResult
|
|
) {
|
|
self.ttl = ttl
|
|
self.minRetryInterval = minRetryInterval
|
|
self.now = now
|
|
self.probe = probe
|
|
}
|
|
|
|
/// Drop any cached verification (e.g. after a Tor restart or when the
|
|
/// network path changes). The next `verify()` re-probes.
|
|
public func invalidate() {
|
|
lastVerifiedAt = nil
|
|
lastProbeAt = nil
|
|
lastResult = nil
|
|
verifiedSnapshot.update(nil)
|
|
}
|
|
|
|
/// The most recent probe outcome, for diagnostics/tests.
|
|
public func lastProbeResult() -> ProbeResult? { lastResult }
|
|
|
|
/// Synchronous view of the cache: `true` while a `verifiedTor` verdict is
|
|
/// within its TTL. Callers that get `false` must route through the async
|
|
/// `verify()` gate (which probes) before opening connections.
|
|
public nonisolated var hasFreshVerification: Bool {
|
|
verifiedSnapshot.isFresh(at: now())
|
|
}
|
|
|
|
/// Returns `true` only when the proxied egress is verified to exit via Tor
|
|
/// (a fresh probe or a cached `verifiedTor` verdict within TTL). Returns
|
|
/// `false` when a non-Tor egress was positively detected *or* when the
|
|
/// egress could not be verified. See the type doc for the full policy.
|
|
public func verify() async -> Bool {
|
|
if isFreshlyVerified() { return true }
|
|
// Throttle re-probes when the last attempt did not verify.
|
|
if let last = lastProbeAt,
|
|
let result = lastResult,
|
|
now().timeIntervalSince(last) < minRetryInterval {
|
|
return decision(for: result)
|
|
}
|
|
if let inFlight { return await inFlight.value }
|
|
|
|
let task = Task<Bool, Never> { await self.runProbe() }
|
|
inFlight = task
|
|
let allowed = await task.value
|
|
inFlight = nil
|
|
return allowed
|
|
}
|
|
|
|
private func isFreshlyVerified() -> Bool {
|
|
guard let last = lastVerifiedAt else { return false }
|
|
return now().timeIntervalSince(last) < ttl
|
|
}
|
|
|
|
private func decision(for result: ProbeResult) -> Bool {
|
|
switch result {
|
|
case .verifiedTor: return true
|
|
// Fail closed: both a positively detected leak and an unverifiable
|
|
// egress refuse connections. Only a fresh `verifiedTor` allows.
|
|
case .unreachable, .notTor: return false
|
|
}
|
|
}
|
|
|
|
private func runProbe() async -> Bool {
|
|
let result = await probe()
|
|
lastProbeAt = now()
|
|
lastResult = result
|
|
switch result {
|
|
case .verifiedTor:
|
|
lastVerifiedAt = now()
|
|
verifiedSnapshot.update(now().addingTimeInterval(ttl))
|
|
return true
|
|
case .notTor:
|
|
lastVerifiedAt = nil
|
|
verifiedSnapshot.update(nil)
|
|
SecureLogger.error(
|
|
"🧅 Tor egress self-check FAILED: request exited via a NON-Tor address — refusing relay connections (possible IP leak)",
|
|
category: .session
|
|
)
|
|
return false
|
|
case .unreachable(let why):
|
|
// Note: a probe only runs when no fresh cached verdict exists, so
|
|
// there is no still-valid cache to preserve or drop here.
|
|
SecureLogger.warning(
|
|
"🧅 Tor egress self-check could not complete (\(why)) — egress UNVERIFIED; refusing relay connections until the canary succeeds (bounded retry)",
|
|
category: .session
|
|
)
|
|
return false
|
|
}
|
|
}
|
|
}
|
|
|
|
// MARK: - Live probe
|
|
|
|
public extension TorEgressVerifier {
|
|
/// Default canary: fetch Tor Project's connectivity check API through the
|
|
/// shared proxied session and assert `IsTor == true`. Because the response
|
|
/// is served from the *exit's* vantage point, a silent direct egress is
|
|
/// caught here as `.notTor`. `check.torproject.org` is clearnet, so this
|
|
/// works without onion-service support.
|
|
///
|
|
/// Follow-up (see PR): make the canary endpoint configurable and add an
|
|
/// onion-service canary so verification does not depend on a single host.
|
|
static func liveProbe(
|
|
endpoint: URL = URL(string: "https://check.torproject.org/api/ip")!,
|
|
timeout: TimeInterval = 20
|
|
) -> @Sendable () async -> ProbeResult {
|
|
return {
|
|
var request = URLRequest(url: endpoint)
|
|
request.timeoutInterval = timeout
|
|
request.cachePolicy = .reloadIgnoringLocalAndRemoteCacheData
|
|
let session = TorURLSession.shared.session
|
|
do {
|
|
let (data, response) = try await session.data(for: request)
|
|
guard let http = response as? HTTPURLResponse,
|
|
(200..<300).contains(http.statusCode) else {
|
|
return .unreachable("http status \((response as? HTTPURLResponse)?.statusCode ?? -1)")
|
|
}
|
|
guard let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any] else {
|
|
return .unreachable("unparseable canary response")
|
|
}
|
|
if let isTor = json["IsTor"] as? Bool {
|
|
return isTor ? .verifiedTor : .notTor
|
|
}
|
|
return .unreachable("canary response missing IsTor")
|
|
} catch {
|
|
return .unreachable(error.localizedDescription)
|
|
}
|
|
}
|
|
}
|
|
}
|