Skip to content

Commit ed884e7

Browse files
committed
fix(mobile): normalize signing keys at relay config boundary
Signed-off-by: Tom Brow <[email protected]>
1 parent a57be89 commit ed884e7

3 files changed

Lines changed: 64 additions & 6 deletions

File tree

‎mobile/lib/shared/relay/relay_provider.dart‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,17 @@ import 'relay_client.dart';
1111
/// - `baseUrl` — where the relay lives (used for WS + media upload)
1212
/// - `nsec` — the user's signing key (drives NIP-42 AUTH and event sigs)
1313
class RelayConfig {
14-
const RelayConfig({required String baseUrl, this.nsec}) : _baseUrl = baseUrl;
14+
const RelayConfig({required String baseUrl, String? nsec})
15+
: _baseUrl = baseUrl,
16+
_nsec = nsec;
1517

1618
/// Relay origin exactly as the active community stored it.
1719
final String _baseUrl;
1820

19-
/// Nostr secret key (bech32 nsec) for signing events and NIP-42 AUTH.
20-
final String? nsec;
21+
/// Normalized Nostr secret key shared by identity, signing, and NIP-42 AUTH.
22+
String? get nsec => _nsec?.trim();
23+
24+
final String? _nsec;
2125

2226
/// The origin as persisted, before scheme canonicalization.
2327
///
@@ -123,7 +127,7 @@ String? pubkeyFromNsec(String? nsec) {
123127
/// The current user's hex pubkey, derived from the active community nsec.
124128
final myPubkeyProvider = Provider<String?>((ref) {
125129
final config = ref.watch(relayConfigProvider);
126-
return pubkeyFromNsec(config.nsec?.trim());
130+
return pubkeyFromNsec(config.nsec);
127131
});
128132

129133
/// Provides a [RelayClient] that reacts to config changes.

‎mobile/lib/shared/theme/community_theme_provider.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class CommunityThemeNotifier extends Notifier<CommunityThemePreference> {
6363
relaySession: ref.read(relaySessionProvider.notifier),
6464
signedEventRelay: SignedEventRelay(
6565
session: ref.read(relaySessionProvider.notifier),
66-
nsec: config.nsec!.trim(),
66+
nsec: config.nsec!,
6767
),
6868
crypto: ref.watch(communityThemeCryptoProvider)!,
6969
onRemote: (remote) => _applyRemote(manager, remote),
@@ -221,7 +221,7 @@ final communityThemeCryptoProvider = Provider<CommunityThemeCrypto?>((ref) {
221221
final config = ref.watch(relayConfigProvider);
222222
final pubkey = ref.watch(myPubkeyProvider);
223223
if (pubkey == null || config.nsec == null) return null;
224-
final privateHex = nostr.Nip19.decode(payload: config.nsec!.trim()).data;
224+
final privateHex = nostr.Nip19.decode(payload: config.nsec!).data;
225225
final key = getConversationKey(privateHex, pubkey);
226226
return CommunityThemeCrypto(
227227
encrypt: (plaintext) => nip44Encrypt(key, plaintext),
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
import 'dart:async';
2+
import 'dart:convert';
3+
import 'dart:io';
4+
5+
import 'package:buzz/shared/relay/relay_provider.dart';
6+
import 'package:buzz/shared/relay/relay_socket.dart';
7+
import 'package:flutter_test/flutter_test.dart';
8+
import 'package:nostr/nostr.dart' as nostr;
9+
10+
void main() {
11+
test('configured padded key completes real NIP-42 authentication', () async {
12+
final keys = nostr.Keys.generate();
13+
final server = await HttpServer.bind(InternetAddress.loopbackIPv4, 0);
14+
addTearDown(() => server.close(force: true));
15+
final received = Completer<nostr.Event>();
16+
server.listen((request) async {
17+
final peer = await WebSocketTransformer.upgrade(request);
18+
addTearDown(peer.close);
19+
peer.listen((frame) {
20+
final data = jsonDecode(frame as String) as List;
21+
if (data.first != 'AUTH') return;
22+
final event = nostr.Event.fromMap(
23+
Map<String, dynamic>.from(data[1] as Map),
24+
);
25+
received.complete(event);
26+
peer.add(jsonEncode(['OK', event.id, true, '']));
27+
});
28+
peer.add(jsonEncode(['AUTH', 'synthetic-challenge']));
29+
});
30+
final config = RelayConfig(
31+
baseUrl: 'http://127.0.0.1:${server.port}',
32+
nsec: ' ${keys.nsec} \n',
33+
);
34+
final socket = RelaySocket(
35+
wsUrl: config.wsUrl,
36+
nsec: config.nsec,
37+
onMessage: (_) {},
38+
onConnected: () {},
39+
onDisconnected: (_) {},
40+
);
41+
addTearDown(socket.dispose);
42+
await socket.connect().timeout(const Duration(seconds: 5));
43+
final event = await received.future.timeout(const Duration(seconds: 5));
44+
expect(socket.state, SocketState.connected);
45+
expect(event.pubkey, keys.public);
46+
expect(event.kind, 22242);
47+
expect(
48+
event.toMap()['tags'],
49+
contains(equals(['challenge', 'synthetic-challenge'])),
50+
);
51+
expect(event.toMap()['tags'], contains(equals(['relay', config.wsUrl])));
52+
expect(event.isValid(), isTrue);
53+
});
54+
}

0 commit comments

Comments
 (0)