mirror of
https://github.com/block/buzz.git
synced 2026-10-30 22:11:36 +00:00
Brings `buzz-media`, `buzz-relay`, all first-party kind-24242 minters, and desktop token minting into compliance with [NIP-FI §kind-24242](https://github.com/block/buzz/blob/main/docs/nips/NIP-FI.md). ## What changed **`buzz-media/src/auth.rs`** - Add `BlossomStrictness` enum (`Strict` | `Permissive`). `Strict` applies full NIP-FI rules (active modes); `Permissive` preserves pre-NIP-FI Off-mode behavior byte-identical [FI-INV-15]. - Rewrite `verify_blossom_auth_event_for_verb` with count-based cardinality: exactly one `t`/`expiration`/`server` in `Strict`; duplicate `x` also rejected. `Permissive` keeps main's boolean semantics exactly: any valued `t` other than the verb (including `""`) rejects, valueless `t` is ignored. - `Strict`: mandatory `server` tag on all proofs (upload + read); absent or mismatched → `evidence_rejected` (`ServerMismatch`). - `Strict`: 60-second proof window (`now - created_at <= 60s`, `expiration <= created_at + 60s`). `Permissive`: 3600s / optional server. - **[F1]** Permissive server validation uses any-match semantics: a proof with multiple `server` tags is accepted if any tag matches the bound host. This restores origin/main base behavior. Strict duplicate-rejection unchanged. - **[F1 compat]** Permissive server gate uses `server_values.is_empty()` (valued tags only) rather than `server_count > 0` (includes valueless tags). A lone valueless `["server"]` tag is treated as absent in Permissive/Off mode, matching pre-NIP-FI base behavior [FI-INV-15]. - **[F4]** Valueless `x` tags in Strict get reads are tracked before `filter_map` so they cannot become absent scope (host-wide authorization). Any `x` tag present in Strict must contain the exact requested sha256. - **[F3 unit]** Cases A–D in `auth.rs` are helper-level unit tests: they call `verify_blossom_upload_auth` and `verify_upload_hash_only` directly. They do not enter the upload pipeline (`process_upload`/`process_video_upload`). Retained as helper evidence. **`buzz-media/src/error.rs`** - Add `DuplicateTag(&'static str)` variant. - Add `blossom_denial_kind()` method: classifies each auth error as `MissingEvidence`, `EvidenceRejected`, or `AuthorizationDenied`. Non-auth errors return `None`. - `IntoResponse` retains the legacy JSON 401 shape [FI-INV-15]. **`buzz-relay/src/api/media.rs`** - Add `MediaDenial(MediaError, BlossomStrictness)` wrapper mapping to byte-exact NIP-FI fixed responses in `Strict`; falls through to legacy JSON in `Permissive`. - `blossom_strictness_from_state()` selects `Strict` when `state.config.nip_fi.is_enforce()`, otherwise `Permissive`. Strictness is threaded through the `admit_nip_fi_http_on_state` NIP-98 closures on upload and read, and through the post-admission X-SHA-256, hash-binding, and membership denials. - `extract_blossom_auth` keeps first-value `Authorization` extraction; Enforce rejects repeated fields at the `admit_nip_fi_http` cardinality gate, and Off keeps legacy behavior [FI-INV-15]. - Both membership-denial call sites use `media_denial(RelayMembershipRequired, strictness)` so Strict mode produces the correct fixed-text response. - `upload_blob` serving-write fence conversion (`:406`) uses `map_err(|e| media_denial(e, strictness))` — a community fence committed between auth admission and lease acquisition no longer resets Strict to Permissive. - Mode-driven regressions in `mod postgres_tests` (selected by the nextest `postgres-ci` profile via `test(/postgres_tests::/)`, `#[ignore = "requires Postgres"]`), run through the full relay router with a real Enforce verifier and assertion: Enforce rejects Permissive-only proofs (300s lifetime, missing `server` tag) on both upload routes and reads with `evidence rejected`; Off accepts the same proofs with pre-NIP-FI responses; DenyProtected answers 503 before any proof check; membership denials are `authorization denied` text/plain in Enforce and exact legacy JSON 403 in Off, with a member positive control. GET and HEAD are each discriminated (HEAD with a suppressed body). Both upload routes pin the handler's `X-SHA-256` missing/malformed/unsigned and post-body hash-mismatch denials in both modes. Off rejects an empty-valued `t` beside a valid one with legacy 401 JSON in either order, and ignores a valueless one. Exact status, Content-Type, challenge, and body bytes are pinned. **`buzz-media/src/upload.rs`** (`mod minio_tests`) - **[F3 pipeline]** Four tests exercising the actual post-body call sites (`process_upload` `:85`, `process_video_upload` `:413`) with real MinIO I/O: buffered/streaming × expired-proof-accept + mismatched-hash-reject. The positive cases use `fresh_strict_upload_auth` (`created_at = now-58`, `expiration = now+2`, lifetime = 60s) — Strict-admissible at sign time — followed by a real 3s sleep so the proof is expired when the upload completes. `nostr::Timestamp::now()` reads the OS wall clock directly; paused Tokio time does not advance it. The negative cases use a pre-expired proof with a mismatched `x` tag. All four are `#[ignore = "requires MinIO"]`; no CI lane runs them automatically. **`buzz-media/src/validation.rs`** - `minimal_valid_mp4()` promoted to `#[cfg(test)] pub(crate)` — a 618-byte pre-computed H.264/avc1 fast-start MP4 available to all `buzz-media` test modules; smoke-tested by `test_minimal_valid_mp4_passes_validate_video_file`. **`desktop/src-tauri/src/commands/media.rs`** - `sign_blossom_upload_auth`: `server` tag mandatory; upload expiry 60s (was 3600s/300s). - `MEDIA_GET_AUTH_EXPIRY_SECS`: 60s (was 600s). **`desktop/src-tauri/src/media_proxy.rs`** - Single re-mint+retry on 401/403 for range requests; non-auth failures do not retry. **`crates/buzz-cli/src/client.rs`** - Read expiry: 60s (was 600s). Upload expiry: 60s. `server` tag mandatory on upload. **`crates/buzz-dev-mcp/src/view_image.rs`** - `MEDIA_GET_AUTH_EXPIRY_SECS`: 60s (was 600s). Test updated. **`mobile/lib/shared/relay/media_auth.dart`** - `_mediaGetAuthLifetimeSeconds`: 60 (was 600). Refresh margin updated. **`mobile/lib/shared/relay/media_upload.dart`** - `_uploadAuthLifetimeSeconds`: 60 (was 300). `server` tag mandatory. **`mobile/lib/features/channels/media_viewer_page/video_viewer.dart`** - **[F2]** Remove Android-specific `VideoPlayerController.networkUrl` streaming path. `video_player_android` 2.9.5 freezes headers into static `DefaultHttpDataSource` request properties — a 60s proof minted at controller creation time becomes stale on seeks. All platforms use the authenticated local-file download path. - **[F2 transport]** `unawaited(request.sink.close())` before `client.send()`. `AbortableStreamedRequest` carries no request body; without closing the sink, `IOClient.send()` awaits `stream.pipe(ioRequest)` which blocks until the sink ends — every video download hung in loading indefinitely on every platform. - **[F2 pending-ctrl]** `pendingController` ref set before the first `await (initialize())`, cleared in all exit paths. Effect cleanup disposes `pendingController.value` so a close-during-init releases the native player even if the initialized event never arrives. - **[F2r(a)]** On native init failure (post-create, pre-initialized-event), the inner catch starts disposal detached via `unawaited(localController.dispose().catchError(...))` — the `.catchError` handler absorbs any disposal exception so it does not reach the test error zone — then rethrows the original load error. `video_player` 2.11.1 completes the init future with an error without disposing the native player. - **[F2r(b)]** Non-2xx error body cancelled via `_cancelVideoResponse()` (subscribe+cancel) instead of `drain()`. `drain()` waits for the upstream to close; a stalled server body blocked `initializeVideo` indefinitely. - **[F2r(d)]** `unawaited(localController.dispose().catchError(...))` in the catch — not `await`. Two failure mechanisms exist: (1) when `createWithOptions()` throws, `_creatingCompleter` is never completed and `await dispose()` deadlocks at `:682-683`, blocking the outer catch from setting error state. (2) when `createWithOptions()` succeeds but initialization fails, `dispose()` runs but its thrown exception becomes an unhandled async error reaching the test zone. Both are fixed: `unawaited` lets the outer catch run immediately and set `error.value`; `.catchError(...)` on the detached disposal future absorbs any disposal exception. **`mobile/test/features/channels/media_viewer_page/video_viewer_test.dart`** - `_FinalizingFakeClient`: calls `request.finalize().drain()` — a test without the sink fix times out because the drain never completes, validating the transport contract. - F2r(a): `forceInitError=true` fake emits `PlatformException` on subscribe; `disposeCallCount >= 1` verifies disposal even on init failure. - F2r(b): `stalledBody` `StreamController` with `onCancel` Completer (bounded completion signal, not a sleep). Asserts: (1) `bodyStreamCancelled=true` while body stream is still open (impossible with `drain()`); (2) error UI visible while body remains open. Restoring `drain()` breaks both. - F2r(c): `neverInitialize=true` fake never sends initialized event; unmount asserts `disposeCallCount >= 1` via `pendingController`. Distinct from the event-error case. - F2r(d): `forceCreateError=true` fake throws `PlatformException` from `createWithOptions()` itself (before any player ID is returned). Asserts error UI visible within a bounded deadline. With the old `await dispose()` the outer catch is blocked — `error.value` is never set and the error UI assertion fails at the deadline; with `unawaited(dispose())` the error text appears immediately. **`mobile/test/features/channels/media_viewer_page/video_viewer_transport_test.dart`** (separate file) - Real-IO loopback probes using `flutter_test` (not `package:test`) to avoid `depend_on_referenced_packages` lint. No `TestWidgetsFlutterBinding` — no HttpClient override interfering with `dart:io`. - Probe 1: `HttpServer.bind(loopbackIPv4, 0)` reads the full request body before replying. Without `sink.close()`, `req.drain()` hangs and the test times out. - Probe 2: server signals request arrival via a Completer (not a sleep); abort fires after confirmed arrival; `client.send()` must throw `RequestAbortedException` (typed assertion) within a bounded 5s deadline. **`scripts/test-video-upload.sh`** - Proof minted with `+60` expiry and mandatory `server` tag. **`buzz-test-client/tests/e2e_media*.rs`** + **`buzz-relay/src/api/media.rs` test fixtures** - All fixtures updated to 55s expiry + `server` tag. **`RELEASING.md`** - New "NIP-FI upload proof freshness (relay floor)" section documenting that 60s proofs require the first relay release carrying this PR's post-body hash-only check (the first tag > `v0.2.1` — update once cut) for reliable large-file uploads. Operators on older self-hosted relays (≤ `v0.2.1`) must upgrade before receiving these clients. ## Finding 3: 60s upload proofs vs old-relay compatibility Desktop/CLI/mobile upload proofs are now 60s. Older relays re-run full expiry verification after the body is transferred. A valid upload whose body transfer takes >60s will fail on an old relay. **Resolution (relay floor prerequisite):** `RELEASING.md` requires that verified supported deployments (relay releases confirmed to carry the post-body hash-only check, commit `75e9bef748`) be in place before distributing 60s-proof client builds. Unknown or unverified self-hosted relay deployments are excluded from distribution until they upgrade. This makes the verified-deployment status a prerequisite for release distribution, not a post-distribution advisory. The concrete tag (`> v0.2.1`) is to be recorded once cut. ## Sequencing note Builds on #7264 (merged): Blossom strictness is derived from its `config.nip_fi` mode in this PR, so enabling `BUZZ_NIP_FI_MODE=enforce` activates the strict verifier with no further wiring. ## GIF compatibility exception An unauthenticated Off-mode request on a configured tenant with no GIF provider changes from 404 to 401 (base `gifs.rs:269-275` checked an unconfigured provider first; the current code authenticates first). All other Off-mode Blossom responses are byte-identical to pre-NIP-FI behavior. --------- Signed-off-by: Will Pfleger <pfleger.will@gmail.com> Signed-off-by: Duncan <dcfd242e557282d7a1e2cf2e6877522682f1e5c6156dc92ca7d90eaedd3b0f95@buzz.block.builderlab.xyz> Co-authored-by: Duncan <dcfd242e557282d7a1e2cf2e6877522682f1e5c6156dc92ca7d90eaedd3b0f95@buzz.block.builderlab.xyz>
245 lines
8.0 KiB
Dart
245 lines
8.0 KiB
Dart
import 'dart:convert';
|
|
import 'dart:async';
|
|
|
|
import 'package:buzz/shared/relay/media_auth.dart';
|
|
import 'package:buzz/shared/relay/media_image.dart';
|
|
import 'package:flutter/painting.dart';
|
|
import 'package:flutter_test/flutter_test.dart';
|
|
import 'package:http/http.dart' as http;
|
|
import 'package:http/testing.dart' as http_testing;
|
|
import 'package:nostr/nostr.dart' as nostr;
|
|
|
|
// Minimal valid 1x1 transparent PNG.
|
|
final _pngBytes = base64Decode(
|
|
'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAA'
|
|
'AAYAAjCB0C8AAAAASUVORK5CYII=',
|
|
);
|
|
|
|
const _relayBase = 'https://relay.example.com';
|
|
const _mediaUrl = '$_relayBase/media/abc123.png';
|
|
|
|
MediaGetAuthService _auth({String? nsec, DateTime Function()? now}) =>
|
|
MediaGetAuthService(baseUrl: _relayBase, nsec: nsec, now: now);
|
|
|
|
void main() {
|
|
TestWidgetsFlutterBinding.ensureInitialized();
|
|
|
|
setUp(() {
|
|
MediaImageProvider.debugResetCooldowns();
|
|
MediaImageProvider.debugNow = DateTime.now;
|
|
PaintingBinding.instance.imageCache.clear();
|
|
PaintingBinding.instance.imageCache.clearLiveImages();
|
|
});
|
|
|
|
group('MediaGetAuthService mint-per-request', () {
|
|
test('consecutive calls return distinct headers (mint-per-request)', () {
|
|
final nsec = nostr.Keys.generate().nsec;
|
|
final auth = _auth(nsec: nsec);
|
|
final first = auth.headersFor(_mediaUrl);
|
|
final second = auth.headersFor(_mediaUrl);
|
|
expect(first, isNotEmpty);
|
|
// With lifetime == margin == 60s, refreshAt == signedAt, so the cache
|
|
// never hits: each call produces a fresh proof.
|
|
expect(identical(first, second), isFalse);
|
|
expect(second['Authorization'], isNot(first['Authorization']));
|
|
});
|
|
|
|
test('each call produces a fresh token regardless of elapsed time', () {
|
|
final nsec = nostr.Keys.generate().nsec;
|
|
var current = DateTime.utc(2026, 7, 21, 12);
|
|
final auth = _auth(nsec: nsec, now: () => current);
|
|
|
|
final first = auth.headersFor(_mediaUrl);
|
|
// No elapsed time: still mints fresh.
|
|
final atZero = auth.headersFor(_mediaUrl);
|
|
expect(identical(atZero, first), isFalse);
|
|
expect(atZero['Authorization'], isNot(first['Authorization']));
|
|
|
|
// Advance clock: still mints fresh.
|
|
current = current.add(const Duration(seconds: 30));
|
|
final at30 = auth.headersFor(_mediaUrl);
|
|
expect(identical(at30, first), isFalse);
|
|
expect(at30['Authorization'], isNot(first['Authorization']));
|
|
});
|
|
|
|
test('non-relay URLs get no headers even with a key', () {
|
|
final nsec = nostr.Keys.generate().nsec;
|
|
final auth = _auth(nsec: nsec);
|
|
expect(auth.headersFor('https://elsewhere.com/media/abc.png'), isEmpty);
|
|
expect(auth.headersFor('$_relayBase/not-media/abc.png'), isEmpty);
|
|
});
|
|
});
|
|
|
|
group('MediaImageProvider cache identity', () {
|
|
test('equal url + same auth service => equal keys', () {
|
|
final auth = _auth(nsec: nostr.Keys.generate().nsec);
|
|
final client = http.Client();
|
|
addTearDown(client.close);
|
|
final a = MediaImageProvider(url: _mediaUrl, auth: auth, client: client);
|
|
final b = MediaImageProvider(url: _mediaUrl, auth: auth, client: client);
|
|
expect(a, equals(b));
|
|
expect(a.hashCode, equals(b.hashCode));
|
|
});
|
|
|
|
test('different auth service (relay/account switch) => unequal keys', () {
|
|
final client = http.Client();
|
|
addTearDown(client.close);
|
|
final a = MediaImageProvider(
|
|
url: _mediaUrl,
|
|
auth: _auth(nsec: nostr.Keys.generate().nsec),
|
|
client: client,
|
|
);
|
|
final b = MediaImageProvider(
|
|
url: _mediaUrl,
|
|
auth: _auth(nsec: nostr.Keys.generate().nsec),
|
|
client: client,
|
|
);
|
|
expect(a, isNot(equals(b)));
|
|
});
|
|
|
|
test('transport client is not part of identity', () {
|
|
final auth = _auth(nsec: nostr.Keys.generate().nsec);
|
|
final c1 = http.Client();
|
|
final c2 = http.Client();
|
|
addTearDown(c1.close);
|
|
addTearDown(c2.close);
|
|
expect(
|
|
MediaImageProvider(url: _mediaUrl, auth: auth, client: c1),
|
|
equals(MediaImageProvider(url: _mediaUrl, auth: auth, client: c2)),
|
|
);
|
|
});
|
|
});
|
|
|
|
group('MediaImageProvider fetching', () {
|
|
test('resolves one fetch for repeated resolves of the same key', () async {
|
|
var fetches = 0;
|
|
final client = http_testing.MockClient((request) async {
|
|
fetches += 1;
|
|
return http.Response.bytes(_pngBytes, 200);
|
|
});
|
|
final auth = _auth(nsec: nostr.Keys.generate().nsec);
|
|
|
|
for (var i = 0; i < 3; i++) {
|
|
final provider = MediaImageProvider(
|
|
url: _mediaUrl,
|
|
auth: auth,
|
|
client: client,
|
|
);
|
|
final completer = provider.resolve(ImageConfiguration.empty);
|
|
await _wait(completer);
|
|
}
|
|
expect(fetches, 1);
|
|
});
|
|
|
|
test('sends auth headers with the fetch', () async {
|
|
Map<String, String>? seen;
|
|
final client = http_testing.MockClient((request) async {
|
|
seen = request.headers;
|
|
return http.Response.bytes(_pngBytes, 200);
|
|
});
|
|
final auth = _auth(nsec: nostr.Keys.generate().nsec);
|
|
final provider = MediaImageProvider(
|
|
url: _mediaUrl,
|
|
auth: auth,
|
|
client: client,
|
|
);
|
|
await _wait(provider.resolve(ImageConfiguration.empty));
|
|
expect(seen?['Authorization'], startsWith('Nostr '));
|
|
});
|
|
|
|
test('failed URL is not refetched until cooldown elapses', () async {
|
|
var fetches = 0;
|
|
final client = http_testing.MockClient((request) async {
|
|
fetches += 1;
|
|
return http.Response('rate limited', 429);
|
|
});
|
|
final auth = _auth(nsec: nostr.Keys.generate().nsec);
|
|
var current = DateTime.utc(2026, 7, 21, 12);
|
|
MediaImageProvider.debugNow = () => current;
|
|
|
|
Future<Object?> attempt() async {
|
|
final provider = MediaImageProvider(
|
|
url: _mediaUrl,
|
|
auth: auth,
|
|
client: client,
|
|
);
|
|
return _waitError(provider.resolve(ImageConfiguration.empty));
|
|
}
|
|
|
|
expect(await attempt(), isA<NetworkImageLoadException>());
|
|
expect(fetches, 1);
|
|
|
|
// Within cooldown: suppressed, no network call.
|
|
expect(await attempt(), isA<MediaImageCooldownException>());
|
|
expect(fetches, 1);
|
|
|
|
// After cooldown: retried.
|
|
current = current.add(const Duration(seconds: 31));
|
|
expect(await attempt(), isA<NetworkImageLoadException>());
|
|
expect(fetches, 2);
|
|
});
|
|
|
|
test('honors Retry-After on 429 (capped)', () async {
|
|
var fetches = 0;
|
|
final client = http_testing.MockClient((request) async {
|
|
fetches += 1;
|
|
return http.Response(
|
|
'rate limited',
|
|
429,
|
|
headers: {'retry-after': '120'},
|
|
);
|
|
});
|
|
final auth = _auth(nsec: nostr.Keys.generate().nsec);
|
|
var current = DateTime.utc(2026, 7, 21, 12);
|
|
MediaImageProvider.debugNow = () => current;
|
|
|
|
Future<Object?> attempt() async {
|
|
final provider = MediaImageProvider(
|
|
url: _mediaUrl,
|
|
auth: auth,
|
|
client: client,
|
|
);
|
|
return _waitError(provider.resolve(ImageConfiguration.empty));
|
|
}
|
|
|
|
await attempt();
|
|
expect(fetches, 1);
|
|
|
|
current = current.add(const Duration(seconds: 60));
|
|
expect(await attempt(), isA<MediaImageCooldownException>());
|
|
expect(fetches, 1);
|
|
|
|
current = current.add(const Duration(seconds: 61));
|
|
await attempt();
|
|
expect(fetches, 2);
|
|
});
|
|
});
|
|
}
|
|
|
|
Future<void> _wait(ImageStream stream) {
|
|
final done = Completer<void>();
|
|
late final ImageStreamListener listener;
|
|
listener = ImageStreamListener(
|
|
(image, sync) {
|
|
image.dispose();
|
|
stream.removeListener(listener);
|
|
if (!done.isCompleted) done.complete();
|
|
},
|
|
onError: (error, stack) {
|
|
stream.removeListener(listener);
|
|
if (!done.isCompleted) done.completeError(error, stack);
|
|
},
|
|
);
|
|
stream.addListener(listener);
|
|
return done.future;
|
|
}
|
|
|
|
Future<Object?> _waitError(ImageStream stream) async {
|
|
try {
|
|
await _wait(stream);
|
|
return null;
|
|
} catch (e) {
|
|
return e;
|
|
}
|
|
}
|