Skip to content

Commit 9b7c441

Browse files
authored
Merge pull request #247 from michaelbeaumont/chore/ignore-pres-req
daemon: Don't log error if we get PresenceRequired over hybrid
2 parents f5d96be + 4a1ed8f commit 9b7c441

2 files changed

Lines changed: 4 additions & 0 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
## Improvements
44

5+
- daemon: Don't log error if we get PresenceRequired over hybrid (Thank you, @michaelbeaumont!)
56
- daemon: Cancel ceremony if UI disappears (Thank you, @michaelbeaumont!)
67
- daemon: Fix UI service failing to launch when started manually instead of via D-Bus activation.
78
- daemon: Allow Firefox to contact daemon on more distros with different app IDs (Thank you, @michaelbeaumont!)

‎credentialsd/src/credential_service/hybrid.rs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ use std::fmt::Debug;
44
use async_stream::stream;
55
use futures_lite::Stream;
66
use libwebauthn::{
7+
UvUpdate,
78
proto::CtapError,
89
transport::{
910
Channel, ChannelSettings, Device,
@@ -347,6 +348,8 @@ async fn handle_hybrid_updates(
347348
while let Ok(msg) = ux_update_receiver.recv().await {
348349
debug!(?msg, "Received hybrid update");
349350
let new_state: Option<HybridStateInternal> = match msg {
351+
// Our UI already indicates this and authenticators over hybrid also generally indicate
352+
CableUxUpdate::UvUpdate(UvUpdate::PresenceRequired) => None,
350353
CableUxUpdate::UvUpdate(uv_update) => {
351354
error!(
352355
"Received unexpected UV update in hybrid handler: {:?}",

0 commit comments

Comments
 (0)