Skip to content

fix(fido2authenticator): fix cipher downgrades during fido2 assertion #1287

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
quexten merged 1 commit into from
Jul 27, 2026
Merged

fix(fido2authenticator): fix cipher downgrades during fido2 assertion #1287

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 21 additions & 27 deletions crates/bitwarden-fido/src/authenticator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use std::sync::Mutex;

use bitwarden_core::Client;
use bitwarden_crypto::CryptoError;
use bitwarden_vault::{CipherError, CipherView, EncryptionContext};
use bitwarden_vault::{CipherError, CipherView, EncryptError, VaultClientExt};
use itertools::Itertools;
use passkey::{
authenticator::{Authenticator, DiscoverabilitySupport, StoreInfo, UiHint, UserCheck},
Expand Down Expand Up @@ -446,15 +446,15 @@ impl passkey::authenticator::CredentialStore for CredentialStoreImpl<'_> {
) -> Result<(), StatusCode> {
#[derive(Debug, Error)]
enum InnerError {
#[error("Client User Id has not been set")]
MissingUserId,
#[error(transparent)]
FillCredential(#[from] FillCredentialError),
#[error(transparent)]
Cipher(#[from] CipherError),
#[error(transparent)]
Crypto(#[from] CryptoError),
#[error(transparent)]
Encrypt(#[from] EncryptError),
#[error(transparent)]
Fido2Callback(#[from] Fido2CallbackError),

#[error("No selected credential available")]
Expand All @@ -469,12 +469,6 @@ impl passkey::authenticator::CredentialStore for CredentialStoreImpl<'_> {
rp: passkey::types::ctap2::make_credential::PublicKeyCredentialRpEntity,
options: passkey::types::ctap2::get_assertion::Options,
) -> Result<(), InnerError> {
let user_id = this
.authenticator
.client
.internal
.get_user_id()
.ok_or(InnerError::MissingUserId)?;
let cred = try_from_credential_full(cred, user, rp, options)?;

// Get the previously selected cipher and add the new credential to it
Expand All @@ -498,14 +492,17 @@ impl passkey::authenticator::CredentialStore for CredentialStoreImpl<'_> {
.replace(selected.clone());

// Encrypt the updated cipher before sending it to the clients to be stored
let encrypted = key_store.encrypt(selected)?;
let encryption_context = this
.authenticator
.client
.vault()
.ciphers()
.encrypt(selected)
.await?;

this.authenticator
.credential_store
.save_credential(EncryptionContext {
cipher: encrypted,
encrypted_for: user_id,
})
.save_credential(encryption_context)
.await?;

Ok(())
Expand All @@ -522,8 +519,6 @@ impl passkey::authenticator::CredentialStore for CredentialStoreImpl<'_> {
async fn update_credential(&mut self, cred: Passkey) -> Result<(), StatusCode> {
#[derive(Debug, Error)]
enum InnerError {
#[error("Client User Id has not been set")]
MissingUserId,
#[error(transparent)]
InvalidGuid(#[from] InvalidGuidError),
#[error("Credential ID does not match selected credential")]
Expand All @@ -535,6 +530,8 @@ impl passkey::authenticator::CredentialStore for CredentialStoreImpl<'_> {
#[error(transparent)]
Crypto(#[from] CryptoError),
#[error(transparent)]
Encrypt(#[from] EncryptError),
#[error(transparent)]
Fido2Callback(#[from] Fido2CallbackError),
#[error(transparent)]
GetSelectedCredential(#[from] GetSelectedCredentialError),
Expand All @@ -545,12 +542,6 @@ impl passkey::authenticator::CredentialStore for CredentialStoreImpl<'_> {
this: &mut CredentialStoreImpl<'_>,
cred: Passkey,
) -> Result<(), InnerError> {
let user_id = this
.authenticator
.client
.internal
.get_user_id()
.ok_or(InnerError::MissingUserId)?;
// Get the previously selected cipher and update the credential
let selected = this.authenticator.get_selected_credential()?;

Expand All @@ -576,14 +567,17 @@ impl passkey::authenticator::CredentialStore for CredentialStoreImpl<'_> {
.replace(selected.clone());

// Encrypt the updated cipher before sending it to the clients to be stored
let encrypted = key_store.encrypt(selected)?;
let encryption_context = this
.authenticator
.client
.vault()
.ciphers()
.encrypt(selected)
.await?;

this.authenticator
.credential_store
.save_credential(EncryptionContext {
cipher: encrypted,
encrypted_for: user_id,
})
.save_credential(encryption_context)
.await?;

Ok(())
Expand Down
Loading