Skip to content

fix: protect BitBox pairing against stale hash on re-pair #308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TaprootFreak merged 3 commits into from
May 8, 2026
Merged

fix: protect BitBox pairing against stale hash on re-pair #308

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
893404f
fix: protect BitBox pairing against stale hash on re-pair
TaprootFreak May 8, 2026
65c89ed
style: comment empty catch on prior-hash read
TaprootFreak May 8, 2026
efe6f13
style: drop markdown emphasis and trim catch comment
TaprootFreak May 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions lib/screens/hardware_connect_bitbox/bloc/connect_bitbox_cubit.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,17 @@ class ConnectBitboxCubit extends Cubit<BitboxConnectionState> {
if (state is BitboxConnecting) return;
emit(BitboxConnecting(device));
try {
// Snapshot any hash from a prior pairing on the same BitboxService
// instance so polling waits for the new session's hash instead of
// accepting a stale value from an earlier pairing.
String? priorHash;
try {
priorHash = await _service.getChannelHash().timeout(const Duration(seconds: 2));
} catch (_) {
// no prior session
}
if (isClosed) return;

var initFailed = false;
_pendingInit = _service
.init(device)
Expand Down Expand Up @@ -67,7 +78,7 @@ class ConnectBitboxCubit extends Cubit<BitboxConnectionState> {
if (initFailed) throw Exception('init failed');
try {
final hash = await _service.getChannelHash().timeout(const Duration(seconds: 2));
if (hash.isNotEmpty) channelHash = hash;
if (hash.isNotEmpty && hash != priorHash) channelHash = hash;
} catch (_) {}
}

Expand All @@ -91,7 +102,7 @@ class ConnectBitboxCubit extends Cubit<BitboxConnectionState> {

try {
emit(BitboxPairing(currentState.device));
final initOk = await (_pendingInit ?? Future.value(true)).timeout(
final initOk = await _pendingInit!.timeout(
const Duration(seconds: 120),
onTimeout: () => false,
);
Expand Down
Loading