Rebase on v0.3.0 new errors, etc.

Author: jcjones

.clippy.toml

@@ -1 +1,2 @@
 type-complexity-threshold = 384
+too-many-arguments-threshold = 8

src/virtualdevices/software_u2f.rs

@@ -20,7 +20,7 @@ impl SoftwareU2FToken {
         _challenge: Vec<u8>,
         _application: crate::AppId,
         _key_handles: Vec<crate::KeyHandle>,
-    ) -> Result<crate::RegisterResult, crate::Error> {
+    ) -> crate::Result<crate::RegisterResult> {
         Ok((vec![0u8; 16], self.dev_info()))
     }
 
@@ -33,7 +33,7 @@ impl SoftwareU2FToken {
         _challenge: Vec<u8>,
         _app_ids: Vec<crate::AppId>,
         _key_handles: Vec<crate::KeyHandle>,
-    ) -> Result<crate::SignResult, crate::Error> {
+    ) -> crate::Result<crate::SignResult> {
         Ok((vec![0u8; 0], vec![0u8; 0], vec![0u8; 0], self.dev_info()))
     }
 

src/virtualdevices/webdriver/testtoken.rs

@@ -2,8 +2,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+use crate::errors;
 use crate::virtualdevices::software_u2f::SoftwareU2FToken;
-use crate::{Error, RegisterFlags, RegisterResult, SignFlags, SignResult};
+use crate::{RegisterFlags, RegisterResult, SignFlags, SignResult};
 
 pub enum TestWireProtocol {
     CTAP1,
@@ -109,7 +110,7 @@ impl TestToken {
         false
     }
 
-    pub fn register(&self) -> Result<RegisterResult, Error> {
+    pub fn register(&self) -> crate::Result<RegisterResult> {
         if self.u2f_impl.is_some() {
             return self.u2f_impl.as_ref().unwrap().register(
                 RegisterFlags::empty(),
@@ -119,10 +120,12 @@ impl TestToken {
                 vec![],
             );
         }
-        Err(Error::Unknown)
+        Err(errors::AuthenticatorError::U2FToken(
+            errors::U2FTokenError::Unknown,
+        ))
     }
 
-    pub fn sign(&self) -> Result<SignResult, Error> {
+    pub fn sign(&self) -> crate::Result<SignResult> {
         if self.u2f_impl.is_some() {
             return self.u2f_impl.as_ref().unwrap().sign(
                 SignFlags::empty(),
@@ -132,6 +135,8 @@ impl TestToken {
                 vec![],
             );
         }
-        Err(Error::Unknown)
+        Err(errors::AuthenticatorError::U2FToken(
+            errors::U2FTokenError::Unknown,
+        ))
     }
 }

src/virtualdevices/webdriver/virtualmanager.rs

@@ -11,6 +11,7 @@ use std::vec;
 use std::{io, string, thread};
 
 use crate::authenticatorservice::AuthenticatorTransport;
+use crate::errors;
 use crate::statecallback::StateCallback;
 use crate::virtualdevices::webdriver::{testtoken, web_api};
 
@@ -66,11 +67,13 @@ impl AuthenticatorTransport for VirtualManager {
         _application: crate::AppId,
         _key_handles: Vec<crate::KeyHandle>,
         _status: Sender<crate::StatusUpdate>,
-        callback: StateCallback<Result<crate::RegisterResult, crate::Error>>,
-    ) -> Result<(), crate::Error> {
+        callback: StateCallback<crate::Result<crate::RegisterResult>>,
+    ) -> crate::Result<()> {
         if self.rloop.is_some() {
             error!("WebDriver state error, prior operation never cancelled.");
-            return Err(crate::Error::Unknown);
+            return Err(errors::AuthenticatorError::U2FToken(
+                errors::U2FTokenError::Unknown,
+            ));
         }
 
         let state = self.state.clone();
@@ -93,7 +96,7 @@ impl AuthenticatorTransport for VirtualManager {
                 },
                 timeout
             ),
-            |_| Err(crate::Error::Unknown)
+            |_| Err(errors::AuthenticatorError::Platform)
         );
 
         self.rloop = Some(rloop);
@@ -108,11 +111,13 @@ impl AuthenticatorTransport for VirtualManager {
         _app_ids: Vec<crate::AppId>,
         _key_handles: Vec<crate::KeyHandle>,
         _status: Sender<crate::StatusUpdate>,
-        callback: StateCallback<Result<crate::SignResult, crate::Error>>,
-    ) -> Result<(), crate::Error> {
+        callback: StateCallback<crate::Result<crate::SignResult>>,
+    ) -> crate::Result<()> {
         if self.rloop.is_some() {
             error!("WebDriver state error, prior operation never cancelled.");
-            return Err(crate::Error::Unknown);
+            return Err(errors::AuthenticatorError::U2FToken(
+                errors::U2FTokenError::Unknown,
+            ));
         }
 
         let state = self.state.clone();
@@ -135,14 +140,14 @@ impl AuthenticatorTransport for VirtualManager {
                 },
                 timeout
             ),
-            |_| Err(crate::Error::Unknown)
+            |_| Err(errors::AuthenticatorError::Platform)
         );
 
         self.rloop = Some(rloop);
         Ok(())
     }
 
-    fn cancel(&mut self) -> Result<(), crate::Error> {
+    fn cancel(&mut self) -> crate::Result<()> {
         if let Some(r) = self.rloop.take() {
             debug!("WebDriver operation cancelled.");
             r.cancel();

src/virtualdevices/webdriver/web_api.rs

@@ -240,8 +240,10 @@ mod handlers {
         };
     }
 
-    pub fn validate_rp_id(rp_id: &String) -> Result<(), crate::Error> {
-        if let Ok(uri) = rp_id.parse::<uri::Uri>().map_err(|_| crate::Error::Unknown) {
+    pub fn validate_rp_id(rp_id: &String) -> crate::Result<()> {
+        if let Ok(uri) = rp_id.parse::<uri::Uri>().map_err(|_| {
+            crate::errors::AuthenticatorError::U2FToken(crate::errors::U2FTokenError::Unknown)
+        }) {
             if uri.scheme().is_none()
                 && uri.path_and_query().is_none()
                 && uri.port().is_none()
@@ -256,7 +258,9 @@ mod handlers {
                 }
             }
         }
-        Err(crate::Error::Unknown)
+        Err(crate::errors::AuthenticatorError::U2FToken(
+            crate::errors::U2FTokenError::Unknown,
+        ))
     }
 
     pub async fn authenticator_add(