Skip to content

Commit 2073e26

Browse files
committed
fix(mobile): require a verified managed record for Solo agents
Revalidation before chat creation and send now reads the chosen agent's own 30177 record, so an agent removed from the owner's inventory on desktop can no longer be messaged from mobile. Inventory records must pass signature verification, as desktop requires, so a forged record can neither add an agent nor supersede a genuine one. Signed-off-by: Tom Brow <[email protected]>
1 parent 34a31ea commit 2073e26

3 files changed

Lines changed: 143 additions & 51 deletions

File tree

‎mobile/lib/shared/me/me_assistants.dart‎

Lines changed: 28 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,7 @@ Future<List<AgentDirectoryEntry>> _loadAssistants(
5555
RelaySessionNotifier session, {
5656
String? pubkey,
5757
}) async {
58-
final candidates = pubkey == null
59-
? await _managedAgentPubkeys(sync, session)
60-
: [pubkey];
58+
final candidates = await _managedAgentPubkeys(sync, session, agent: pubkey);
6159
final profiles = <String, NostrEvent>{};
6260
for (var offset = 0; offset < candidates.length; offset += _pageSize) {
6361
final batch = candidates.sublist(
@@ -98,12 +96,16 @@ Future<List<AgentDirectoryEntry>> _loadAssistants(
9896

9997
/// Candidate agents from the owner's own managed-agent records, as desktop
10098
/// discovers them. The records are discovery hints only: each candidate's
101-
/// profile must still carry a valid NIP-OA attestation by the owner.
99+
/// profile must still carry a valid NIP-OA attestation by the owner. With
100+
/// [agent], only that agent's record is read, so an agent removed from the
101+
/// inventory also fails revalidation before chat creation and send.
102102
Future<List<String>> _managedAgentPubkeys(
103103
MeSync sync,
104-
RelaySessionNotifier session,
105-
) async {
104+
RelaySessionNotifier session, {
105+
String? agent,
106+
}) async {
106107
final heads = <String, NostrEvent>{};
108+
final verified = <String>{};
107109
NostrEvent? cursor;
108110
for (var page = 0; ; page++) {
109111
if (page == _maxInventoryPages) {
@@ -116,6 +118,9 @@ Future<List<String>> _managedAgentPubkeys(
116118
authors: [sync.pubkey],
117119
limit: _pageSize,
118120
until: cursor?.createdAt,
121+
tags: {
122+
if (agent != null) '#d': [agent],
123+
},
119124
extensions: {'before_id': ?cursor?.id},
120125
),
121126
]);
@@ -130,10 +135,21 @@ Future<List<String>> _managedAgentPubkeys(
130135
throw StateError('Agent inventory response is outside its owner.');
131136
}
132137
for (final event in events) {
133-
final agent = event.getTagValue('d');
134-
if (agent == null) continue;
135-
final previous = heads[agent];
136-
if (previous == null || _newer(event, previous)) heads[agent] = event;
138+
final d = event.getTagValue('d');
139+
if (d == null || (agent != null && d != agent)) continue;
140+
// Like desktop, skip an envelope that fails verification so a forged
141+
// record can neither add an agent nor supersede a genuine one. An ID
142+
// already verified needs no second check when pages overlap.
143+
if (!verified.contains(event.id)) {
144+
try {
145+
nostr.Event.fromJson(jsonEncode(event.toJson()));
146+
} catch (_) {
147+
continue;
148+
}
149+
verified.add(event.id);
150+
}
151+
final previous = heads[d];
152+
if (previous == null || _newer(event, previous)) heads[d] = event;
137153
}
138154
if (events.length < _pageSize) break;
139155
// Relay order is newest first, then ID ascending at ties.
@@ -144,8 +160,8 @@ Future<List<String>> _managedAgentPubkeys(
144160
cursor = last;
145161
}
146162
return [
147-
for (final MapEntry(key: agent, value: event) in heads.entries)
148-
if (_agentPubkey.hasMatch(agent) && _hasName(event)) agent,
163+
for (final MapEntry(key: d, value: event) in heads.entries)
164+
if (_agentPubkey.hasMatch(d) && _hasName(event)) d,
149165
];
150166
}
151167

‎mobile/test/features/channels/me/solo_creation_tags_test.dart‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,18 @@ class _EmptyChannels extends ChannelsNotifier {
4747

4848
class _Relay extends RelaySessionNotifier {
4949
final NostrEvent profile;
50+
final NostrEvent inventory;
5051
final submitted = <NostrEvent>[];
51-
_Relay(this.profile);
52+
_Relay(this.profile, this.inventory);
5253

5354
@override
5455
Future<List<NostrEvent>> queryRelay(
5556
List<NostrFilter> filters, {
5657
Duration timeout = const Duration(seconds: 8),
57-
}) async =>
58-
filters.any((filter) => filter.kinds.contains(0)) ? [profile] : [];
58+
}) async => [
59+
if (filters.any((filter) => filter.kinds.contains(0))) profile,
60+
if (filters.any((filter) => filter.kinds.contains(30177))) inventory,
61+
];
5962

6063
@override
6164
Future<List<NostrEvent>> fetchHistory(
@@ -108,7 +111,17 @@ void main() {
108111
],
109112
).toMap(),
110113
);
111-
final relay = _Relay(profile);
114+
final inventory = NostrEvent.fromJson(
115+
nostr.Event.from(
116+
kind: 30177,
117+
content: jsonEncode({'name': 'Owned agent'}),
118+
secretKey: owner.secret,
119+
tags: [
120+
['d', agent.public],
121+
],
122+
).toMap(),
123+
);
124+
final relay = _Relay(profile, inventory);
112125
final config = RelayConfig(
113126
baseUrl: 'https://relay.test',
114127
nsec: owner.nsec,

‎mobile/test/shared/me/me_assistants_test.dart‎

Lines changed: 98 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ class _Relay extends RelaySessionNotifier {
2929
final filter = filters.single.toJson();
3030
if (filters.single.kinds.single == 30177) {
3131
inventoryFilters.add(filter);
32+
final d = (filter['#d'] as List?)?.cast<String>();
33+
if (d != null) {
34+
// Return every record so the client must enforce the requested d.
35+
return [for (final page in inventory) ...page];
36+
}
3237
final page = inventoryFilters.length - 1;
3338
return page < inventory.length ? inventory[page] : const [];
3439
}
@@ -79,28 +84,30 @@ void main() {
7984

8085
var fakeAgents = 0;
8186
String fakeAgent() => (++fakeAgents).toRadixString(16).padLeft(64, 'a');
82-
// Discovery does not verify inventory signatures (the relay does), so the
83-
// records skip Schnorr signing to keep large pagination fixtures fast.
84-
var records = 0;
85-
final ownerPubkey = owner.public;
8687
NostrEvent managed(
8788
String d, {
8889
nostr.Keys? by,
8990
int time = 1,
9091
int kind = 30177,
9192
Object? content = const {'name': 'Agent'},
92-
}) => NostrEvent(
93-
id: (++records).toRadixString(16).padLeft(64, '0'),
94-
pubkey: by?.public ?? ownerPubkey,
95-
createdAt: time,
96-
kind: kind,
97-
tags: [
98-
['d', d],
99-
],
100-
content: jsonEncode(content),
101-
sig: '',
93+
}) => NostrEvent.fromJson(
94+
nostr.Event.from(
95+
kind: kind,
96+
content: jsonEncode(content),
97+
secretKey: (by ?? owner).secret,
98+
createdAt: time,
99+
tags: [
100+
['d', d],
101+
],
102+
).toMap(),
102103
);
103104

105+
// A full page of signed records with distinct times, shared because
106+
// signing dominates fixture cost.
107+
late final fullPage = [
108+
for (var i = 0; i < 100; i++) managed(fakeAgent(), time: 5000 - i),
109+
];
110+
104111
ProviderContainer setup(_Relay relay) {
105112
final sync = MeSync(
106113
relay,
@@ -245,9 +252,7 @@ void main() {
245252
expect(relay.profileAuthors.single, [agent.public]);
246253
});
247254
test('reads beyond the first inventory page with a cursor', () async {
248-
final first = [
249-
for (var i = 0; i < 100; i++) managed(fakeAgent(), time: 200 - i),
250-
];
255+
final first = fullPage;
251256
final relay = _Relay(
252257
inventory: [
253258
first,
@@ -260,7 +265,7 @@ void main() {
260265
agent.public,
261266
);
262267
expect(relay.inventoryFilters.length, 2);
263-
expect(relay.inventoryFilters.last['until'], 101);
268+
expect(relay.inventoryFilters.last['until'], 4901);
264269
expect(relay.inventoryFilters.last['before_id'], first.last.id);
265270
expect(relay.profileAuthors.map((a) => a!.length), [100, 1]);
266271
expect(relay.profileFilters.map((f) => f['limit']), [100, 1]);
@@ -270,11 +275,9 @@ void main() {
270275
() async {
271276
final relay = _Relay(
272277
inventory: [
278+
// Each page ends at an older record, so the cursor keeps advancing.
273279
for (var page = 0; page < 11; page++)
274-
[
275-
for (var i = 0; i < 100; i++)
276-
managed(fakeAgent(), time: 2000 - page * 100 - i),
277-
],
280+
[...fullPage.take(99), managed(fakeAgent(), time: 100 - page)],
278281
],
279282
);
280283
await expectLater(
@@ -286,8 +289,7 @@ void main() {
286289
},
287290
);
288291
test('inventory paging fails when the cursor does not advance', () async {
289-
final page = [for (var i = 0; i < 100; i++) managed(fakeAgent())];
290-
final relay = _Relay(inventory: [page, page]);
292+
final relay = _Relay(inventory: [fullPage, fullPage]);
291293
await expectLater(
292294
setup(relay).read(meAssistantsProvider.future),
293295
throwsStateError,
@@ -299,9 +301,12 @@ void main() {
299301
// Relay order is created_at descending, then id ascending. An unordered
300302
// tied page must still advance from its largest id.
301303
final tied = [for (var i = 0; i < 100; i++) managed(fakeAgent(), time: 5)];
304+
final largest = tied
305+
.map((e) => e.id)
306+
.reduce((a, b) => a.compareTo(b) > 0 ? a : b);
302307
final relay = _Relay(
303308
inventory: [
304-
[...tied.reversed],
309+
[...tied]..sort((a, b) => b.id.compareTo(a.id)),
305310
[managed(agent.public, time: 5)],
306311
],
307312
profiles: [profile(agent, ownedBy: owner)],
@@ -311,27 +316,29 @@ void main() {
311316
agent.public,
312317
);
313318
expect(relay.inventoryFilters.last['until'], 5);
314-
expect(relay.inventoryFilters.last['before_id'], tied.last.id);
319+
expect(relay.inventoryFilters.last['before_id'], largest);
315320
});
316321
test('same-second inventory records keep the lowest id', () async {
322+
final named = managed(agent.public, time: 5);
323+
final unnamed = managed(agent.public, time: 5, content: {'name': ''});
317324
final relay = _Relay(
318325
inventory: [
319-
[
320-
managed(agent.public, time: 5),
321-
managed(agent.public, time: 5, content: {'name': ''}),
322-
],
326+
[named, unnamed],
323327
],
324328
profiles: [profile(agent, ownedBy: owner)],
325329
);
330+
final namedWins = named.id.compareTo(unnamed.id) < 0;
326331
expect(
327-
(await setup(relay).read(meAssistantsProvider.future)).single.pubkey,
328-
agent.public,
332+
(await setup(
333+
relay,
334+
).read(meAssistantsProvider.future)).map((a) => a.pubkey),
335+
namedWins ? [agent.public] : isEmpty,
329336
);
330337
});
331338
test('rejects an inventory page larger than requested', () async {
332339
final relay = _Relay(
333340
inventory: [
334-
[for (var i = 0; i < 101; i++) managed(fakeAgent())],
341+
[...fullPage, managed(fakeAgent())],
335342
],
336343
);
337344
await expectLater(
@@ -381,21 +388,77 @@ void main() {
381388
);
382389
}
383390
test('creation revalidates only the chosen assistant', () async {
384-
final relay = _Relay(profiles: [profile(agent, ownedBy: owner)]);
391+
final relay = _Relay(
392+
inventory: [
393+
[managed(other.public), managed(agent.public)],
394+
],
395+
profiles: [
396+
profile(agent, ownedBy: owner),
397+
profile(other, ownedBy: owner),
398+
],
399+
);
385400
final container = setup(relay);
386401
expect(
387402
await isOwnedMeAssistant(container.read(meSyncProvider), agent.public),
388403
isTrue,
389404
);
390-
expect(relay.inventoryFilters, isEmpty);
405+
expect(relay.inventoryFilters.single['authors'], [owner.public]);
406+
expect(relay.inventoryFilters.single['#d'], [agent.public]);
391407
expect(relay.profileAuthors, [
392408
[agent.public],
393409
]);
394410
});
411+
test('creation rejects an agent removed from the inventory', () async {
412+
final relay = _Relay(
413+
inventory: [
414+
[managed(other.public)],
415+
],
416+
profiles: [profile(agent, ownedBy: owner)],
417+
);
418+
expect(
419+
await isOwnedMeAssistant(setup(relay).read(meSyncProvider), agent.public),
420+
isFalse,
421+
);
422+
expect(relay.profileFilters, isEmpty);
423+
});
424+
test('ignores inventory records that fail verification', () async {
425+
final genuine = managed(other.public, time: 1);
426+
final forged = managed(agent.public, time: 2).toJson()
427+
..['sig'] = genuine.sig;
428+
final superseding =
429+
managed(other.public, time: 3, content: {'name': ''}).toJson()
430+
..['content'] = jsonEncode({'name': ''})
431+
..['sig'] = genuine.sig;
432+
final relay = _Relay(
433+
inventory: [
434+
[
435+
NostrEvent.fromJson(superseding),
436+
NostrEvent.fromJson(forged),
437+
genuine,
438+
],
439+
],
440+
profiles: [
441+
profile(agent, ownedBy: owner),
442+
profile(other, ownedBy: owner),
443+
],
444+
);
445+
final container = setup(relay);
446+
expect(
447+
(await container.read(meAssistantsProvider.future)).map((a) => a.pubkey),
448+
[other.public],
449+
);
450+
expect(
451+
await isOwnedMeAssistant(container.read(meSyncProvider), agent.public),
452+
isFalse,
453+
);
454+
});
395455
test(
396456
'creation rejects revoked ownership and unrelated returned profiles',
397457
() async {
398458
final relay = _Relay(
459+
inventory: [
460+
[managed(agent.public), managed(other.public)],
461+
],
399462
profiles: [
400463
profile(agent, ownedBy: owner),
401464
profile(agent, time: 2),

0 commit comments

Comments
 (0)