Mirrors/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-06-12 21:27:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move backend checks to build.rs to fail fast, and updated dependencies

Browse Source
This commit is contained in:
Daniel García
2019-07-09 17:26:34 +02:00
parent cef38bf40b
commit 05a1137828
9 changed files with 359 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/api/core/two_factor.rs
View File

@ -563,7 +563,7 @@ pub struct YubikeyMetadata {
}
use yubico::config::Config;
use yubico::Yubico;
use yubico::verify;
fn parse_yubikeys(data: &EnableYubikeyData) -> Vec<String> {
let data_keys = [&data.Key1, &data.Key2, &data.Key3, &data.Key4, &data.Key5];
@ -591,12 +591,11 @@ fn get_yubico_credentials() -> Result<(String, String), Error> {
fn verify_yubikey_otp(otp: String) -> EmptyResult {
let (yubico_id, yubico_secret) = get_yubico_credentials()?;
let yubico = Yubico::new();
let config = Config::default().set_client_id(yubico_id).set_key(yubico_secret);
match CONFIG.yubico_server() {
Some(server) => yubico.verify(otp, config.set_api_hosts(vec![server])),
None => yubico.verify(otp, config),
Some(server) => verify(otp, config.set_api_hosts(vec![server])),
None => verify(otp, config),
}
.map_res("Failed to verify OTP")
.and(Ok(()))