mirror of
https://github.com/block/buzz.git
synced 2026-11-02 15:31:27 +00:00
Block is turning on NIP-FI enforcement on the Block relay. Desktop gets organization sign-in in block/buzz-app#1424. Mobile can already attach NIP-FI assertions, but only for Builderlab-hosted communities, through the build's single Builderlab account. The dogfood build needs that account for public hosted communities, so it can't simply be pointed at the Block tenant. This adds a separate **organization realm**, configured at build time: - `BUZZ_ORGANIZATION_URL`: the tenant's HTTPS origin (for example `https://block.builderlab.xyz`). - `BUZZ_ORGANIZATION_RELAYS`: the exact relay hosts that trust that tenant. The two must be set together. The app refuses to start if they're malformed, overlap a hosted community, or reuse the hosted origin. Without them, nothing changes. For a configured relay: - The app keeps its own organization session and signs in through the browser at the tenant's existing login (`/api/goose/v1/auth/login`). Block SSO happens there. - It requests assertions from the same `/v1/buzz/identity/assertions` route that hosted communities use, and attaches them to the relay socket, HTTP, media, huddle and remote-agent requests. - Unlike the hosted path, it doesn't require an identity backup before the first binding. As on desktop, the tenant binds the member's existing key on first issuance. A key already bound to a different one is refused before any request is sent. - When signed out, it connects without an assertion and lets the relay decide. A bottom banner offers **Sign in**. After sign-in, the relay reconnects with a fresh assertion. Hosted communities keep their existing banner and flow. The tenant accepts only the registered `xyz.block.buzz.mobile:/auth/callback` return URL, so both realms share it. Each `BrowserAuth` owner leaves callbacks whose `state` belongs to another owner's attempt to that owner. ### Before merge - [ ] Kenny Lopez reviews the visible changes. ### Validation Added tests (`organization_relay_auth_test.dart`): - Configuration parsing and exact host matching. - An assertion is issued for the exact relay and key, then cached. - A different bound key is refused. - Signed out connects without an assertion. - Other relays never receive the assertion. - The shared callback is routed between the hosted and organization owners. Full `mobile-check` and `mobile-test` pass. RunnerTests pass locally except `testNativeNavigationTitleExpandsAgainAtTop`, which this PR doesn't touch. Added tests (`organization_sign_in_test.dart`, `relay_auth_isolation_test.dart`, `builderlab_account_test.dart`), each failing without its fix: - Concurrent account restores at cold start share one adopted account. - An exchange from a cancelled attempt never changes a newer sign-in. - Storage failures while clearing the intent or cancelling leave the busy state. - An unreadable saved organization session is replaced by signing in again. - A stalled organization issuer never delays a hosted relay's assertion. This test needs `BUZZ_AUTH_DOMAINS` and skips without it. CI's configured-auth-domains step doesn't list it yet, because that workflow change needs a token with `workflow` scope. Added tests also cover a restore after an offline start (the banner clears once a relay retry restores the session) and the iOS bridge allowlist (`/auth/native` and tenant login on Builderlab subdomains; other hosts, paths, ports, userinfo and fragments refused). Simulator (iPhone 17, iOS 27) with the dogfood defines against the production Block relay `buzz.block.builderlab.xyz`, on a WARP Mac: - The app starts with the organization configuration and connects to the relay while signed out, showing the organization **Sign in** banner. - **Sign in** opens the system sign-in session for `block.builderlab.xyz`, and the banner shows **Finishing organization sign-in…**. Cancelling returns to **Sign in** with no error. Before the bridge fix, no browser opened and the banner reported that sign-in did not finish. - The bottom banners (organization sign-in, hosted reconnect, and the sign-in recovery row) now sit above Home's floating Search/New bar, which used to cover **Sign in**. A journey test checks the banner clears the bar, and fails without the fix.  - The simulator run stopped at the system consent prompt (SSO does not work in the simulator). The app calls were driven through the VM service (the same `signIn()`/`cancel()` the banner buttons call) because the simulator could not be tapped. Device (iPhone 12 mini) against bb-block staging in enforce mode, where every probe without an assertion gets 401: - Signed out, the organization banner shows and the app stays responsive. Cancel at the consent prompt returns to **Sign in**, and retry works. - Block SSO through Okta completes, and the relay admits the reconnect with the assertion. - After relaunch the app connects, loads channel history, and shows no banner for over 60 seconds. - Before the restore fix, 2 of 4 cold starts showed "cannot use this community with this key" although the session was valid. With it, 8 of 8 cold starts connected. Known limitation: adding an enforcing organization relay by community link is tracked in #8791. The dogfood build enables this in squareup/buzz-releases (`tomb/dogfood-organization-sign-in`). App Store builds stay unchanged. 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Signed-off-by: Tom Brow <tomb@squareup.com> Co-authored-by: Tom Brow <tomb@squareup.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
123 lines
4.9 KiB
Swift
123 lines
4.9 KiB
Swift
import AuthenticationServices
|
|
import Flutter
|
|
import UIKit
|
|
|
|
/// Keeps the authentication callback scoped to the system browser session.
|
|
final class BuzzBrowserAuthBridge: NSObject, ASWebAuthenticationPresentationContextProviding {
|
|
private let channel: FlutterMethodChannel
|
|
private var session: ASWebAuthenticationSession?
|
|
private var pending: FlutterResult?
|
|
private var attemptID: UUID?
|
|
|
|
private let isActive: () -> Bool
|
|
private let startSession: (ASWebAuthenticationSession) -> Bool
|
|
private var activationObserver: NSObjectProtocol?
|
|
private var activationTimeout: DispatchWorkItem?
|
|
|
|
init(
|
|
messenger: FlutterBinaryMessenger,
|
|
isActive: @escaping () -> Bool = { UIApplication.shared.applicationState == .active },
|
|
startSession: @escaping (ASWebAuthenticationSession) -> Bool = { $0.start() }
|
|
) {
|
|
self.isActive = isActive
|
|
self.startSession = startSession
|
|
channel = FlutterMethodChannel(name: "buzz/browser_auth", binaryMessenger: messenger)
|
|
super.init()
|
|
channel.setMethodCallHandler { [weak self] call, result in
|
|
guard let self else { return }
|
|
if call.method == "cancel" {
|
|
self.session?.cancel()
|
|
self.finish(nil, code: "cancelled")
|
|
result(nil)
|
|
return
|
|
}
|
|
guard call.method == "start" else { result(FlutterMethodNotImplemented); return }
|
|
guard self.session == nil,
|
|
let args = call.arguments as? [String: String],
|
|
let raw = args["url"], let url = URL(string: raw),
|
|
Self.allowsLogin(url)
|
|
else { result(FlutterError(code: "unavailable", message: nil, details: nil)); return }
|
|
self.pending = result
|
|
let attemptID = UUID()
|
|
self.attemptID = attemptID
|
|
let session = ASWebAuthenticationSession(url: url, callbackURLScheme: "xyz.block.buzz.mobile") { [weak self] callback, error in
|
|
DispatchQueue.main.async {
|
|
guard self?.attemptID == attemptID else { return }
|
|
let cancelled = (error as? ASWebAuthenticationSessionError)?.code == .canceledLogin
|
|
self?.finish(callback?.absoluteString, code: cancelled ? "cancelled" : "unavailable")
|
|
}
|
|
}
|
|
session.presentationContextProvider = self
|
|
session.prefersEphemeralWebBrowserSession = false
|
|
#if DEBUG
|
|
session.prefersEphemeralWebBrowserSession = args["ephemeral"] == "true"
|
|
#endif
|
|
self.session = session
|
|
self.startWhenActive(attemptID)
|
|
|
|
}
|
|
}
|
|
|
|
/// Builderlab login pages only: the public account's `/auth/native`, and a
|
|
/// tenant's CLI login on its own host for organization sign-in.
|
|
static func allowsLogin(_ url: URL) -> Bool {
|
|
guard url.scheme == "https", let host = url.host?.lowercased(),
|
|
url.user == nil, url.password == nil, url.port == nil, url.fragment == nil
|
|
else { return false }
|
|
let publicHosts = ["app.builderlab.xyz", "app.builderlabstaging.xyz"]
|
|
if publicHosts.contains(host) { return url.path == "/auth/native" }
|
|
let tenant = ["builderlab.xyz", "builderlabstaging.xyz"].contains { domain in
|
|
let label = host.dropLast(domain.count + 1)
|
|
return host.hasSuffix(".\(domain)") && !label.isEmpty && !label.contains(".")
|
|
}
|
|
return tenant && url.path == "/api/goose/v1/auth/login"
|
|
}
|
|
|
|
// Safari delivers a deep link before UIKit finishes activating our app.
|
|
// ASWebAuthenticationSession.start() rejects presentation during that handoff.
|
|
private func startWhenActive(_ id: UUID) {
|
|
guard attemptID == id, let session else { return }
|
|
if isActive() {
|
|
clearActivationWait()
|
|
if !startSession(session) { finish(nil, code: "unavailable") }
|
|
return
|
|
}
|
|
activationObserver = NotificationCenter.default.addObserver(
|
|
forName: UIApplication.didBecomeActiveNotification, object: nil, queue: .main
|
|
) { [weak self] _ in
|
|
guard let self, self.attemptID == id, self.isActive() else { return }
|
|
self.startWhenActive(id)
|
|
}
|
|
let timeout = DispatchWorkItem { [weak self] in
|
|
guard let self, self.attemptID == id else { return }
|
|
self.finish(nil, code: "unavailable")
|
|
}
|
|
activationTimeout = timeout
|
|
DispatchQueue.main.asyncAfter(deadline: .now() + 10, execute: timeout)
|
|
}
|
|
|
|
private func clearActivationWait() {
|
|
if let activationObserver { NotificationCenter.default.removeObserver(activationObserver) }
|
|
activationObserver = nil
|
|
activationTimeout?.cancel()
|
|
activationTimeout = nil
|
|
}
|
|
|
|
deinit { clearActivationWait() }
|
|
|
|
private func finish(_ callback: String?, code: String) {
|
|
clearActivationWait()
|
|
let result = pending
|
|
attemptID = nil
|
|
pending = nil
|
|
session = nil
|
|
if let callback { result?(callback) }
|
|
else { result?(FlutterError(code: code, message: nil, details: nil)) }
|
|
}
|
|
|
|
func presentationAnchor(for session: ASWebAuthenticationSession) -> ASPresentationAnchor {
|
|
UIApplication.shared.connectedScenes.compactMap { $0 as? UIWindowScene }
|
|
.flatMap { $0.windows }.first(where: { $0.isKeyWindow }) ?? ASPresentationAnchor()
|
|
}
|
|
}
|