Fix FIDO PIN state

Yubico · Oct 29, 2024 · 7c4b838 · 7c4b838
1 parent ed7cac9
commit 7c4b838
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/helper/helper/fido.py b/helper/helper/fido.py
@@ -242,6 +242,7 @@ def set_pin(self, params, event, signal):
             self._info = self.ctap.get_info()
             return RpcResponse(dict(), ["device_info"])
         except CtapError as e:
+            self._token = None
             return _handle_pin_error(e, self.client_pin)
 
     @action(condition=lambda self: Config.is_supported(self._info))

diff --git a/lib/desktop/fido/state.dart b/lib/desktop/fido/state.dart
@@ -99,10 +99,12 @@ class _DesktopFidoStateNotifier extends FidoStateNotifier {
     _session.setErrorHandler('state-reset', (_) async {
       ref.invalidate(_sessionProvider(devicePath));
     });
-    _session.setErrorHandler('auth-required', (_) async {
+    _session.setErrorHandler('auth-required', (e) async {
       final pin = ref.read(_pinProvider(devicePath));
       if (pin != null) {
         await unlock(pin);
+      } else {
+        throw e;
       }
     });
     ref.onDispose(() {
@@ -153,6 +155,7 @@ class _DesktopFidoStateNotifier extends FidoStateNotifier {
       return unlock(newPin);
     } on RpcError catch (e) {
       if (e.status == 'pin-validation') {
+        ref.invalidate(_pinProvider);
         ref.invalidateSelf();
         return PinResult.failed(FidoPinFailureReason.invalidPin(
             e.body['retries'], e.body['auth_blocked']));