Skip to content

Commit 323cec6

Browse files
wesbillmanBrain
andcommitted
fix(mobile): retire invite journals on sign-out and preserve backup recovery
Remove matching pending keys before completing community removal and retry cleanup on existing invite entry. Restrict iOS 16 only when setup needs a new backup, allowing backed-up identities to recover. Co-authored-by: Brain <1a02c72794dcd0f07058a353bc3a81f4028b8c77c92c87fce6d5c8b85970a20b@buzz.block.builderlab.xyz> Signed-off-by: Wes <[email protected]>
1 parent 071e3f7 commit 323cec6

8 files changed

Lines changed: 168 additions & 29 deletions

File tree

‎mobile/lib/features/invites/invite_join_provider.dart‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ class InviteJoinNotifier extends Notifier<InviteJoinState> {
125125
final communities = await ref.read(communityListProvider.future);
126126
final existing = _existingCommunity(communities, invite.relayUrl);
127127
if (existing != null) {
128+
await _retirePendingInvite(invite, existing);
128129
await ref
129130
.read(communityListProvider.notifier)
130131
.switchCommunity(existing.id);
@@ -177,6 +178,7 @@ class InviteJoinNotifier extends Notifier<InviteJoinState> {
177178
final communities = await ref.read(communityListProvider.future);
178179
final existing = _existingCommunity(communities, invite.relayUrl);
179180
if (existing != null) {
181+
await _retirePendingInvite(invite, existing);
180182
await ref
181183
.read(communityListProvider.notifier)
182184
.switchCommunity(existing.id);
@@ -260,15 +262,7 @@ class InviteJoinNotifier extends Notifier<InviteJoinState> {
260262
await ref
261263
.read(authProvider.notifier)
262264
.authenticateWithCommunity(community);
263-
try {
264-
await storage.completePendingInvite(
265-
invite.relayUrl,
266-
invite.code,
267-
community,
268-
);
269-
} catch (_) {
270-
// The saved destination is authoritative; retain the journal on failure.
271-
}
265+
await _retirePendingInvite(invite, community);
272266
_pendingStarterSetupCommunity = community;
273267
state = state.copyWith(isStarterSetupRecovery: true);
274268
await startStarterSetupRecovery();
@@ -282,6 +276,20 @@ class InviteJoinNotifier extends Notifier<InviteJoinState> {
282276
}
283277
}
284278

279+
Future<void> _retirePendingInvite(
280+
InviteDeepLink invite,
281+
Community community,
282+
) async {
283+
try {
284+
await ref
285+
.read(communityStorageProvider)
286+
.completePendingInvite(invite.relayUrl, invite.code, community);
287+
} catch (_) {
288+
// The saved destination is authoritative. Reopening retries cleanup;
289+
// community removal must erase every journal copy before it succeeds.
290+
}
291+
}
292+
285293
/// Runs the pending recovery after its progress UI has been presented.
286294
Future<void> startStarterSetupRecovery() async {
287295
final community = _pendingStarterSetupCommunity;

‎mobile/lib/shared/community/community_storage.dart‎

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,18 +74,16 @@ class CommunityStorage {
7474
}
7575

7676
static final _pendingInvites = SerialQueue();
77+
static const _pendingInvitePrefix = 'buzz_pending_invite_v1_';
7778

7879
static String _pendingInviteKey(String relayUrl, String code) {
7980
final uri = Uri.parse(relayUrl);
8081
final origin = uri
8182
.replace(
8283
scheme: ['https', 'wss'].contains(uri.scheme) ? 'https' : 'http',
83-
path: '',
84-
query: null,
85-
fragment: null,
8684
)
8785
.origin;
88-
return 'buzz_pending_invite_v1_${sha256.convert(utf8.encode(jsonEncode([origin, code])))}';
86+
return '${_pendingInvitePrefix}${sha256.convert(utf8.encode(jsonEncode([origin, code])))}';
8987
}
9088

9189
/// Retain the claim identity before sending a request with uncertain outcomes.
@@ -118,7 +116,10 @@ class CommunityStorage {
118116
)) {
119117
return;
120118
}
121-
await _secure.delete(key: _pendingInviteKey(relayUrl, code));
119+
final key = _pendingInviteKey(relayUrl, code);
120+
if (await _secure.read(key: key) == community.nsec) {
121+
await _secure.delete(key: key);
122+
}
122123
});
123124

124125
Future<void> save(Community community) async {
@@ -135,11 +136,30 @@ class CommunityStorage {
135136
/// Replaces the complete stored community list in one secure-storage write.
136137
Future<void> saveAll(List<Community> communities) => _saveList(communities);
137138

138-
Future<void> remove(String id) async {
139+
Future<void> remove(String id) => _pendingInvites.run(() async {
139140
final all = await loadAll();
141+
final removedKeys = all
142+
.where((item) => item.id == id)
143+
.map((item) => item.nsec)
144+
.whereType<String>()
145+
.toSet();
146+
if (removedKeys.isNotEmpty) {
147+
// Retire every journal copy before removing the saved community. If a
148+
// deletion fails, keep that community so sign-out can safely retry.
149+
final records = await _secure.readAll();
150+
for (final entry in records.entries) {
151+
if (entry.key.startsWith(_pendingInvitePrefix) &&
152+
removedKeys.contains(entry.value)) {
153+
await _secure.delete(key: entry.key);
154+
if (await _secure.read(key: entry.key) != null) {
155+
throw StateError('Could not remove the pending invite identity');
156+
}
157+
}
158+
}
159+
}
140160
all.removeWhere((w) => w.id == id);
141161
await _saveList(all);
142-
}
162+
});
143163

144164
Future<String?> loadActiveId() async {
145165
return _secure.read(key: _keyActiveId);

‎mobile/lib/shared/hosted/hosted_flow.dart‎

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -509,18 +509,13 @@ class HostedFlow extends ChangeNotifier {
509509
_clearCommunityBatch();
510510
_batchSubject = session.subject;
511511
}
512-
if (target is! NostrBindDeepLink &&
513-
!await HpkeBackup.supportsHostedSetup()) {
514-
if (!_disposed && generation == _generation) {
515-
_set(HostedFlowStage.blocked, HostedFlowProblem.unsupportedPlatform);
516-
}
517-
return;
518-
}
512+
final canSealBackup =
513+
target is NostrBindDeepLink || await HpkeBackup.supportsSealing();
519514
if (_disposed || generation != _generation) return;
520515
var resolved = await identity.resolve(
521516
isCurrent: _isCurrent(generation),
522517
selectedPubkey: selectedPubkey ?? _pairedPubkey,
523-
createNew: createNew,
518+
createNew: createNew && canSealBackup,
524519
);
525520
if (_pairedPubkey != null && resolved.pubkey != _pairedPubkey) {
526521
_set(HostedFlowStage.blocked, HostedFlowProblem.identityMismatch);
@@ -529,6 +524,26 @@ class HostedFlow extends ChangeNotifier {
529524
if (target is! NostrBindDeepLink) {
530525
for (var step = 0; step < 2; step++) {
531526
if (_disposed || generation != _generation) return;
527+
if (!canSealBackup) {
528+
final saved = await store.read();
529+
if (_disposed || generation != _generation) return;
530+
final needsNewBackup =
531+
resolved.state == HostedIdentityState.needsSetup ||
532+
resolved.state == HostedIdentityState.needsBackup ||
533+
(resolved.state == HostedIdentityState.needsBinding &&
534+
!(saved?.hasBackupFor(
535+
backend: HostedEnvironment.origin.origin,
536+
subject: session.subject,
537+
) ??
538+
false));
539+
if (needsNewBackup) {
540+
_set(
541+
HostedFlowStage.blocked,
542+
HostedFlowProblem.unsupportedPlatform,
543+
);
544+
return;
545+
}
546+
}
532547
if (resolved.state == HostedIdentityState.needsBinding &&
533548
resolved.pubkey != null) {
534549
final response = await account.post(

‎mobile/lib/shared/hosted/hosted_flow_problem_message.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ String hostedFlowProblemMessage(
2727
HostedFlowProblem.identityUnreadable =>
2828
'Your saved identity could not be read safely. Leave setup and recover access to this device’s secure storage before continuing.',
2929
HostedFlowProblem.unsupportedPlatform =>
30-
'Hosted account setup requires iOS 17 or later for secure backup. Update iOS to continue. You can still use self-hosted communities.',
30+
'Creating a secure backup requires iOS 17 or later. Update iOS to continue, or recover an identity that already has a backup. You can still use self-hosted communities.',
3131
HostedFlowProblem.backupUnavailable =>
3232
'Secure backup is not supported on this device yet. Your identity has been kept; joining requires a confirmed backup.',
3333
HostedFlowProblem.requestRejected =>

‎mobile/lib/shared/hosted/hpke_backup.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ enum HpkeBackupFailure { invalidEnrollment, identityMismatch, unavailable }
1515
class HpkeBackup {
1616
static const _channel = MethodChannel('buzz/hosted_hpke');
1717

18-
/// iOS 16 can use Nostr communities, but cannot create hosted backups.
19-
static Future<bool> supportsHostedSetup() async {
18+
/// Existing backups can be recovered on iOS 16, but new ones require iOS 17.
19+
static Future<bool> supportsSealing() async {
2020
if (defaultTargetPlatform != TargetPlatform.iOS) return true;
2121
return await _channel.invokeMethod<bool>('isSupported') == true;
2222
}

‎mobile/test/features/invites/invite_join_provider_test.dart‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import 'package:buzz/app.dart';
1313
import 'package:buzz/features/channels/channel.dart';
1414
import 'package:buzz/features/invites/invite_join_provider.dart';
1515
import 'package:buzz/shared/auth/auth.dart';
16+
import 'package:buzz/shared/community/community_provider.dart';
1617
import 'package:buzz/shared/deeplink/deep_link.dart';
1718

1819
import '../../shared/community/community_storage_test.dart';
@@ -681,13 +682,18 @@ void main() {
681682
() async {
682683
var attempts = 0;
683684
String? claimedPubkey;
685+
String? lastClaimPubkey;
684686
final bodies = <String>[];
685687
final secure = FakeSecureStorage();
686688
final storage = CommunityStorage(secure: secure);
687689
final auth = _RecordingAuthNotifier();
688690
ProviderContainer open() => ProviderContainer(
689691
overrides: [
690692
communityStorageProvider.overrideWithValue(storage),
693+
communitySnapshotWriterProvider.overrideWithValue((_) async {}),
694+
communityPushLeaseRevocationEnqueuerProvider.overrideWithValue(
695+
(_) async => false,
696+
),
691697
authProvider.overrideWith(() => auth),
692698
// Keep the production fresh-key generator: a fixed fake masks key loss.
693699
inviteJoinRecoveryProvider.overrideWithValue(
@@ -709,6 +715,7 @@ void main() {
709715
)
710716
as Map;
711717
final pubkey = event['pubkey'] as String;
718+
lastClaimPubkey = pubkey;
712719
if (attempts == 1) {
713720
claimedPubkey = pubkey;
714721
throw http.ClientException('Response lost after commit');
@@ -764,6 +771,71 @@ void main() {
764771
),
765772
isEmpty,
766773
);
774+
final saved = (await storage.loadAll()).single;
775+
// A crash after saving the community can leave the journal behind.
776+
await storage.pendingInviteIdentity(
777+
invite.relayUrl,
778+
invite.code,
779+
() => saved.nsec!,
780+
);
781+
await container.read(inviteJoinProvider.notifier).prepare(invite);
782+
expect(
783+
(await secure.readAll()).values.where((value) => value == saved.nsec),
784+
isEmpty,
785+
);
786+
787+
// Also cover a destination saved after the confirmation page was opened.
788+
await storage.saveAll([]);
789+
container.invalidate(communityListProvider);
790+
await container.read(inviteJoinProvider.notifier).prepare(invite);
791+
await storage.saveAll([saved]);
792+
container.invalidate(communityListProvider);
793+
await storage.pendingInviteIdentity(
794+
invite.relayUrl,
795+
invite.code,
796+
() => saved.nsec!,
797+
);
798+
await container.read(inviteJoinProvider.notifier).confirmJoin();
799+
expect(
800+
(await secure.readAll()).values.where((value) => value == saved.nsec),
801+
isEmpty,
802+
);
803+
804+
// Any matching journal, including a different invite, must be retired on
805+
// sign-out. Unrelated pending identities must survive.
806+
await storage.pendingInviteIdentity(
807+
invite.relayUrl,
808+
invite.code,
809+
() => saved.nsec!,
810+
);
811+
await storage.pendingInviteIdentity(
812+
invite.relayUrl,
813+
'another-code',
814+
() => saved.nsec!,
815+
);
816+
final unrelated = nostr.Keys.generate().nsec;
817+
await storage.pendingInviteIdentity(
818+
'wss://other.example',
819+
'other-code',
820+
() => unrelated,
821+
);
822+
secure.failPendingInviteDeletes = true;
823+
await expectLater(
824+
container.read(authProvider.notifier).signOut(),
825+
throwsStateError,
826+
);
827+
expect((await storage.loadAll()).single.nsec, saved.nsec);
828+
secure.failPendingInviteDeletes = false;
829+
await container.read(authProvider.notifier).signOut();
830+
expect(await storage.loadAll(), isEmpty);
831+
expect((await secure.readAll()).values, isNot(contains(saved.nsec)));
832+
expect((await secure.readAll()).values, contains(unrelated));
833+
await container.read(inviteJoinProvider.notifier).prepare(invite);
834+
await container.read(inviteJoinProvider.notifier).confirmJoin();
835+
expect(attempts, 3);
836+
expect(lastClaimPubkey, isNot(claimedPubkey));
837+
expect(container.read(inviteJoinProvider).status, InviteJoinStatus.error);
838+
expect(await storage.loadAll(), isEmpty);
767839
},
768840
);
769841

‎mobile/test/features/onboarding/hosted_journeys_test.dart‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -785,7 +785,23 @@ void main() {
785785
f.profileUnavailable = unreadableProfile;
786786
await f.mount(tester);
787787
// Account restoration may resume independently of the Add choices.
788-
await f.flow.signInAccount();
788+
tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(
789+
const MethodChannel('buzz/hosted_hpke'),
790+
(call) async {
791+
expect(
792+
call.method,
793+
'isSupported',
794+
reason: 'Recovery must not seal a new backup',
795+
);
796+
return false;
797+
},
798+
);
799+
debugDefaultTargetPlatformOverride = TargetPlatform.iOS;
800+
try {
801+
await f.flow.signInAccount();
802+
} finally {
803+
debugDefaultTargetPlatformOverride = null;
804+
}
789805
await f.settle(tester);
790806
expect(f.flow.stage, HostedFlowStage.chooseCommunities);
791807
expect(f.probes, isEmpty);
@@ -811,6 +827,8 @@ void main() {
811827
expect((await f.store.read())!.pubkey, f.keys.public);
812828
expect(f.sent('/recovery'), hasLength(1));
813829
expect(f.sent('/challenge'), isEmpty);
830+
expect(f.sent('/nsec-backups'), isEmpty);
831+
expect(f.sent('/enrollment'), isEmpty);
814832
expect(await f.storage.loadActiveId(), saved.id);
815833
expect(find.byType(OnboardingAppEntry), findsNothing);
816834
},

‎mobile/test/shared/community/community_storage_test.dart‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import 'package:buzz/shared/push/push_subscription.dart';
1212
class FakeSecureStorage extends Fake implements FlutterSecureStorage {
1313
final Map<String, String> _data = {};
1414
final Map<String, int> _writeCounts = {};
15+
bool failPendingInviteDeletes = false;
1516

1617
@override
1718
Future<String?> read({
@@ -52,7 +53,12 @@ class FakeSecureStorage extends Fake implements FlutterSecureStorage {
5253
WebOptions? webOptions,
5354
AppleOptions? mOptions,
5455
WindowsOptions? wOptions,
55-
}) async => _data.remove(key);
56+
}) async {
57+
if (failPendingInviteDeletes && key.startsWith('buzz_pending_invite_')) {
58+
throw StateError('Secure storage deletion unavailable');
59+
}
60+
_data.remove(key);
61+
}
5662

5763
@override
5864
Future<Map<String, String>> readAll({

0 commit comments

Comments
 (0)