MirrorHub/bitwarden_rs
0
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden synced 2024-12-14 17:43:46 +01:00
Code Issues Releases Wiki Activity

Merge pull request #257 from Step7750/fix-nfc-mobile

Browse source 
Fixes NFC Response for Mobile Yubikey OTP Login
This commit is contained in:
Daniel García 2018-11-17 15:28:41 +01:00 committed by GitHub
commit 17052b665f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/api/core/two_factor.rs
View file

@ -507,9 +507,9 @@ struct EnableYubikeyData {
#[derive(Deserialize, Serialize, Debug)]
#[allow(non_snake_case)]
struct YubikeyMetadata {
pub struct YubikeyMetadata {
Keys: Vec<String>,
Nfc: bool,
pub Nfc: bool,
}
use yubico::Yubico;

13
src/api/identity.rs
View file

@ -269,6 +269,19 @@ fn _json_err_twofactor(providers: &[i32], user_uuid: &str, conn: &DbConn) -> Api
result["TwoFactorProviders2"][provider.to_string()] = Value::Object(map);
}
Some(TwoFactorType::YubiKey) => {
let twofactor = match TwoFactor::find_by_user_and_type(user_uuid, TwoFactorType::YubiKey as i32, &conn) {
Some(tf) => tf,
None => err!("No YubiKey devices registered"),
};
let yubikey_metadata: two_factor::YubikeyMetadata = serde_json::from_str(&twofactor.data).expect("Can't parse Yubikey Metadata");
let mut map = JsonMap::new();
map.insert("Nfc".into(), Value::Bool(yubikey_metadata.Nfc));
result["TwoFactorProviders2"][provider.to_string()] = Value::Object(map);
}
_ => {}
}
}