shimun/ctap
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

implement make_credential_devices & rename feature

Browse Source
This commit is contained in:
shimun 2020-04-01 17:58:53 +02:00
parent 1202fed98d
commit 4e14d265b8
Signed by: shimun
GPG Key ID: E81D8382DC2F971B
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -27,4 +27,4 @@ crossbeam = "0.7.3"
hex = "0.4.0" hex = "0.4.0"
[features] [features]
assert_devices = ["crossbeam"] request_multiple = ["crossbeam"]

31
src/util.rs
View File

@ -1,10 +1,10 @@
use crate::cbor::AuthenticatorData; use crate::cbor::AuthenticatorData;
use crate::{FidoAssertionRequest, FidoCredential, FidoDevice, FidoErrorKind, FidoResult}; use crate::{FidoAssertionRequest, FidoCredentialRequest, FidoCredential, FidoDevice, FidoErrorKind, FidoResult};
#[cfg(feature = "assert_devices")] #[cfg(feature = "request_multiple")]
use crossbeam::thread; use crossbeam::thread;
use std::sync::mpsc::channel; use std::sync::mpsc::channel;
#[cfg(feature = "assert_devices")] #[cfg(feature = "request_multiple")]
pub fn request_multiple_devices< pub fn request_multiple_devices<
'a, 'a,
T: Send + 'a, T: Send + 'a,
@ -42,17 +42,22 @@ pub fn request_multiple_devices<
.unwrap() .unwrap()
} }
/// Will send the `assertion` to all supplied `devices` and return either the first successful assertion or the last error /// Will send the `assertion_request` to all supplied `devices` and return either the first successful assertion or the last error
#[cfg(feature = "assert_devices")] #[cfg(feature = "request_multiple")]
pub fn get_assertion_devices<'a>( pub fn get_assertion_devices<'a>(
assertion: &'a FidoAssertionRequest, assertion_request: &'a FidoAssertionRequest,
devices: impl Iterator<Item = &'a mut FidoDevice>, devices: impl Iterator<Item = &'a mut FidoDevice>,
) -> FidoResult<(&'a FidoCredential, AuthenticatorData)> { ) -> FidoResult<(&'a FidoCredential, AuthenticatorData)> {
let get_assertion = |device: &mut FidoDevice| device.get_assertion(assertion); let get_assertion = |device: &mut FidoDevice| device.get_assertion(assertion_request);
request_multiple_devices(devices.map(|device| { request_multiple_devices(devices.map(|device| (device, &get_assertion)))
( }
device,
&get_assertion, /// Will send the `credential_request` to all supplied `devices` and return either the first credential or the last error
) #[cfg(feature = "request_multiple")]
})) pub fn make_credential_devices<'a>(
credential_request: &'a FidoCredentialRequest,
devices: impl Iterator<Item = &'a mut FidoDevice>,
) -> FidoResult<FidoCredential> {
let make_credential = |device: &mut FidoDevice| device.make_credential(credential_request);
request_multiple_devices(devices.map(|device| (device, &make_credential)))
} }