Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## Improvements

- daemon: Don't log error if we get PresenceRequired over hybrid (Thank you, @michaelbeaumont!)
- daemon: Cancel ceremony if UI disappears (Thank you, @michaelbeaumont!)
- daemon: Fix UI service failing to launch when started manually instead of via D-Bus activation.
- daemon: Allow Firefox to contact daemon on more distros with different app IDs (Thank you, @michaelbeaumont!)
Expand Down
3 changes: 3 additions & 0 deletions credentialsd/src/credential_service/hybrid.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use std::fmt::Debug;
use async_stream::stream;
use futures_lite::Stream;
use libwebauthn::{
UvUpdate,
proto::CtapError,
transport::{
Channel, ChannelSettings, Device,
Expand Down Expand Up @@ -347,6 +348,8 @@ async fn handle_hybrid_updates(
while let Ok(msg) = ux_update_receiver.recv().await {
debug!(?msg, "Received hybrid update");
let new_state: Option<HybridStateInternal> = match msg {
// Our UI already indicates this and authenticators over hybrid also generally indicate
CableUxUpdate::UvUpdate(UvUpdate::PresenceRequired) => None,
CableUxUpdate::UvUpdate(uv_update) => {
error!(
"Received unexpected UV update in hybrid handler: {:?}",
Expand Down