Skip to content

Implement first step of cancellation: Stop all handler when one completes/fails #204

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

Open
msirringhaus wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Implement first step of cancellation: Stop all handler when one completes/fails #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e1f2ec
Implement first step of cancellation: Stop all handler when one compl…
msirringhaus Aug 13, 2026
3cb7522
Make device selection cancellable
msirringhaus Aug 19, 2026
d5e4220
Make handle_events cancellable
msirringhaus Aug 19, 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
6 changes: 3 additions & 3 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions credentialsd/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ ring = "=0.17.14"
serde_json = "=1.0.151"
tokio = { version = "=1.53.1", features = ["rt-multi-thread"] }
tokio-stream = "=0.1.19"
tokio-util = "=0.7.13"

[dev-dependencies]
gio = "=0.22.8"
Expand Down
117 changes: 67 additions & 50 deletions credentialsd/src/credential_service/hybrid.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use tokio::sync::{
broadcast,
mpsc::{self, Sender},
};
use tokio_util::sync::CancellationToken;
use tracing::{debug, error};

use libwebauthn::transport::cable::channel::{CableUpdate, CableUxUpdate};
Expand All @@ -29,6 +30,7 @@ pub(crate) trait HybridHandler {
fn start(
&self,
request: &CredentialRequest,
cancellation: CancellationToken,
) -> impl Stream<Item = HybridEvent> + Unpin + Send + Sized + 'static;
}

Expand All @@ -44,6 +46,7 @@ impl HybridHandler for InternalHybridHandler {
fn start(
&self,
request: &CredentialRequest,
cancellation: CancellationToken,
) -> impl Stream<Item = HybridEvent> + Unpin + Send + Sized + 'static {
tracing::debug!("Starting hybrid operation");
let request = request.clone();
Expand Down Expand Up @@ -95,60 +98,74 @@ impl HybridHandler for InternalHybridHandler {

tracing::debug!("Polling hybrid channel for updates.");
let response: Result<AuthenticatorResponse, Error> = loop {
match &request {
CredentialRequest::CreatePublicKeyCredentialRequest(make_request) => {
match channel.webauthn_make_credential(make_request).await {
Ok(response) => break Ok(response.into()),
Err(WebAuthnError::Ctap(ctap_error)) => {
if ctap_error.is_retryable_user_error() {
tracing::debug!(
"Retrying credential creation operation because of CTAP error: {:?}",
ctap_error
);
continue;
} else {
tracing::error!(
"Received CTAP unrecoverable CTAP error: {:?}",
ctap_error
);
break Err(Error::AuthenticatorError);
tokio::select! {
result = async {
match &request {
CredentialRequest::CreatePublicKeyCredentialRequest(make_request) => {
match channel.webauthn_make_credential(make_request).await {
Ok(response) => Ok(response.into()),
Err(WebAuthnError::Ctap(ctap_error)) => {
if ctap_error.is_retryable_user_error() {
tracing::debug!(
"Retrying credential creation operation because of CTAP error: {:?}",
ctap_error
);
Err(None)
} else {
tracing::error!(
"Received CTAP unrecoverable CTAP error: {:?}",
ctap_error
);
Err(Some(Error::AuthenticatorError))
}
}
Err(err) => {
tracing::error!(
"Received unrecoverable error from authenticator: {:?}",
err
);
Err(Some(Error::AuthenticatorError))
}
}
}
Err(err) => {
tracing::error!(
"Received unrecoverable error from authenticator: {:?}",
err
);
break Err(Error::AuthenticatorError);
}
};
}
CredentialRequest::GetPublicKeyCredentialRequest(get_request) => {
match channel.webauthn_get_assertion(get_request).await {
Ok(response) => break Ok(response.into()),
Err(WebAuthnError::Ctap(ctap_error)) => {
if ctap_error.is_retryable_user_error() {
tracing::debug!(
"Retrying assertion operation because of CTAP error: {:?}",
ctap_error
);
continue;
} else {
tracing::error!(
"Received CTAP unrecoverable CTAP error: {:?}",
ctap_error
);
break Err(Error::AuthenticatorError);
CredentialRequest::GetPublicKeyCredentialRequest(get_request) => {
match channel.webauthn_get_assertion(get_request).await {
Ok(response) => Ok(response.into()),
Err(WebAuthnError::Ctap(ctap_error)) => {
if ctap_error.is_retryable_user_error() {
tracing::debug!(
"Retrying assertion operation because of CTAP error: {:?}",
ctap_error
);
Err(None)
} else {
tracing::error!(
"Received CTAP unrecoverable CTAP error: {:?}",
ctap_error
);
Err(Some(Error::AuthenticatorError))
}
}
Err(err) => {
tracing::error!(
"Received unrecoverable error from authenticator: {:?}",
err
);
Err(Some(Error::AuthenticatorError))
}
}
}
Err(err) => {
tracing::error!(
"Received unrecoverable error from authenticator: {:?}",
err
);
break Err(Error::AuthenticatorError);
}
};
}
} => {
match result {
Ok(response) => break Ok(response),
Err(Some(err)) => break Err(err),
Err(None) => continue, // Retryable error
}
}
_ = cancellation.cancelled() => {
tracing::debug!("Hybrid handler cancelled, stopping processing");
break Err(Error::Internal("Request cancelled".to_string()));
}
}
};
Expand Down
Loading