mirror of
https://github.com/block/buzz.git
synced 2026-11-05 00:41:28 +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>
91 lines
3.2 KiB
Dart
91 lines
3.2 KiB
Dart
import 'package:flutter/foundation.dart';
|
|
|
|
import 'hosted_environment.dart';
|
|
|
|
/// Trusted build configuration for an organization's identity provider (a
|
|
/// Builderlab tenant), never supplied by a deep link or relay. Organization
|
|
/// relays get NIP-FI assertions from this origin's account session, separately
|
|
/// from hosted communities' account.
|
|
abstract final class OrganizationEnvironment {
|
|
static bool get enabled => origin != null;
|
|
|
|
/// `BUZZ_ORGANIZATION_URL`: the tenant's HTTPS origin, for example
|
|
/// `https://block.builderlab.xyz`.
|
|
static final Uri? origin = parseOrigin(
|
|
const String.fromEnvironment('BUZZ_ORGANIZATION_URL'),
|
|
const String.fromEnvironment('BUZZ_ORGANIZATION_RELAYS'),
|
|
);
|
|
|
|
/// `BUZZ_ORGANIZATION_RELAYS`: comma-separated exact relay hosts that trust
|
|
/// this tenant. Subdomains and other ports never match.
|
|
static final List<String> relayHosts = parseRelayHosts(
|
|
const String.fromEnvironment('BUZZ_ORGANIZATION_RELAYS'),
|
|
);
|
|
|
|
/// Whether this build attaches its organization session's assertions here.
|
|
static bool protects(Uri relay) => enabled && matches(relay, relayHosts);
|
|
|
|
@visibleForTesting
|
|
static bool matches(Uri relay, List<String> hosts) =>
|
|
['wss', 'https'].contains(relay.scheme) &&
|
|
relay.userInfo.isEmpty &&
|
|
!relay.hasQuery &&
|
|
!relay.hasFragment &&
|
|
(relay.path.isEmpty || relay.path == '/') &&
|
|
(!relay.hasPort || relay.port == 443) &&
|
|
hosts.contains(relay.host.toLowerCase());
|
|
|
|
@visibleForTesting
|
|
static Uri? parseOrigin(String url, String relays) {
|
|
if (url.isEmpty != relays.trim().isEmpty) {
|
|
throw StateError(
|
|
'BUZZ_ORGANIZATION_URL and BUZZ_ORGANIZATION_RELAYS must be set together',
|
|
);
|
|
}
|
|
if (url.isEmpty) return null;
|
|
final uri = Uri.parse(url);
|
|
if (uri.scheme != 'https' ||
|
|
uri.host.isEmpty ||
|
|
uri.userInfo.isNotEmpty ||
|
|
uri.hasPort ||
|
|
uri.hasQuery ||
|
|
uri.hasFragment ||
|
|
(uri.path.isNotEmpty && uri.path != '/')) {
|
|
throw StateError('BUZZ_ORGANIZATION_URL must be an HTTPS origin');
|
|
}
|
|
final origin = Uri.parse(uri.origin);
|
|
// Sessions and browser attempts are stored per origin host.
|
|
if (origin.host == HostedEnvironment.origin.host) {
|
|
throw StateError(
|
|
'BUZZ_ORGANIZATION_URL must differ from the hosted account origin',
|
|
);
|
|
}
|
|
return origin;
|
|
}
|
|
|
|
@visibleForTesting
|
|
static List<String> parseRelayHosts(String relays) => List.unmodifiable(
|
|
relays
|
|
.split(',')
|
|
.map((host) => host.trim().toLowerCase())
|
|
.where((host) => host.isNotEmpty)
|
|
.map((host) {
|
|
if (!RegExp(
|
|
r'^[a-z0-9](?:[a-z0-9-]*[a-z0-9])?(?:\.[a-z0-9](?:[a-z0-9-]*[a-z0-9])?)+$',
|
|
).hasMatch(host)) {
|
|
throw StateError(
|
|
'BUZZ_ORGANIZATION_RELAYS must contain DNS names, not URLs or wildcards',
|
|
);
|
|
}
|
|
// Never send one realm's session to another realm's relay.
|
|
if (HostedEnvironment.accountOriginFor(Uri.parse('wss://$host')) !=
|
|
null) {
|
|
throw StateError(
|
|
'BUZZ_ORGANIZATION_RELAYS must not include hosted communities',
|
|
);
|
|
}
|
|
return host;
|
|
}),
|
|
);
|
|
}
|