Android wrapper error handling

Cargo.toml

@@ -23,6 +23,7 @@ u2f = ["auth-base", "untrusted",  "serde_repr", ]
 webauthn-server = [ "webauthn", "webpki" ]
 webauthn = [ "auth-base", "bytes", "serde_cbor", "uuid", "http", "ed25519-dalek", "p256", "indexmap" ]
 auth-base = ["base64", "byteorder", "ring", "serde", "serde_derive", "serde_json", "serde_bytes"]
+android = ["jni"]
 
 [dependencies]
 sha2 = {version = "0.10" , features = ["oid"]}
@@ -54,7 +55,7 @@ p256 = { version = "0.13.2", optional = true }
 indexmap = { version = "2.2.6", features = ["serde"], optional = true }
 
 [target.'cfg(target_os = "android")'.dependencies]
-jni = { version = "0.21.1" }
+jni = { version = "0.21.1", optional = true }
 
 [target.'cfg(target_arch="wasm32")'.dependencies]
 wasm-bindgen = { version = "0.2.91" }

src/oath/hotp.rs

@@ -140,7 +140,7 @@ impl OtpAuth for HOTPContext {
             "otpauth://hotp/{}?secret={}&algorithm={}&digits={}&counter={}",
             label.unwrap_or("slauth"),
             base32::encode(base32::Alphabet::RFC4648 { padding: false }, self.secret.as_slice()),
-            self.alg.to_string(),
+            self.alg,
             self.digits,
             self.counter
         );

src/oath/mod.rs

@@ -4,6 +4,7 @@ use hmac::{
 };
 use sha1::Sha1;
 use sha2::{Sha256, Sha512};
+use std::fmt::Display;
 
 pub mod hotp;
 pub mod totp;
@@ -71,13 +72,14 @@ impl HashesAlgorithm {
     }
 }
 
-impl ToString for HashesAlgorithm {
-    fn to_string(&self) -> String {
-        match self {
+impl Display for HashesAlgorithm {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let str = match self {
             HashesAlgorithm::SHA1 => "SHA1".to_string(),
             HashesAlgorithm::SHA256 => "SHA256".to_string(),
             HashesAlgorithm::SHA512 => "SHA512".to_string(),
-        }
+        };
+        write!(f, "{}", str)
     }
 }
 

src/oath/totp.rs

@@ -203,7 +203,7 @@ impl OtpAuth for TOTPContext {
             "otpauth://totp/{}?secret={}&algorithm={}&digits={}&period={}",
             label.unwrap_or("slauth"),
             base32::encode(base32::Alphabet::RFC4648 { padding: false }, self.secret.as_slice()),
-            self.alg.to_string(),
+            self.alg,
             self.digits,
             self.period
         );

src/u2f/proto/web_message.rs

@@ -33,7 +33,6 @@ pub struct Registration {
     pub attestation_cert: Vec<u8>,
 }
 
-///
 #[derive(Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct RegisterRequest {
@@ -43,7 +42,6 @@ pub struct RegisterRequest {
     pub challenge: String,
 }
 
-///
 #[derive(Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct RegisteredKey {
@@ -97,7 +95,6 @@ impl<'a> From<&'a U2fRequestType> for U2fResponseType {
     }
 }
 
-///
 #[derive(Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct U2fRequest {
@@ -121,17 +118,14 @@ pub struct U2fRequest {
     pub data: Request,
 }
 
-///
 #[derive(Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct U2fRegisterRequest {
-    ///
     pub register_requests: Vec<RegisterRequest>,
     /// An array of RegisteredKeys representing the U2F tokens registered to this user.
     pub registered_keys: Vec<RegisteredKey>,
 }
 
-///
 #[derive(Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct U2fSignRequest {
@@ -141,7 +135,6 @@ pub struct U2fSignRequest {
     pub registered_keys: Vec<RegisteredKey>,
 }
 
-///
 #[derive(Serialize, Deserialize)]
 #[serde(untagged)]
 pub enum Request {
@@ -234,7 +227,6 @@ pub struct U2fSignResponse {
     pub client_data: String,
 }
 
-///
 #[derive(Serialize, Deserialize)]
 #[serde(untagged)]
 pub enum Response {

src/u2f/server/mod.rs

@@ -208,7 +208,6 @@ impl Registration {
 }
 
 impl U2fSignResponse {
-    ///
     pub fn validate_signature(&self, public_key: &[u8]) -> Result<bool, Error> {
         let U2fSignResponse {
             signature_data,

src/webauthn/authenticator/mod.rs

@@ -180,7 +180,7 @@ impl WebauthnAuthenticator {
     pub fn generate_attestation_object(
         alg: CoseAlgorithmIdentifier,
         aaguid: Uuid,
-        credential_id: &Vec<u8>,
+        credential_id: &[u8],
         rp_id: &str,
         attestation_flags: u8,
     ) -> Result<(AttestationObject, String, Vec<u8>), WebauthnCredentialRequestError> {
@@ -250,7 +250,7 @@ impl WebauthnAuthenticator {
         let attested_credential_data = if attestation_flags & AttestationFlags::AttestedCredentialDataIncluded as u8 != 0 {
             Some(AttestedCredentialData {
                 aaguid: aaguid.into_bytes(),
-                credential_id: credential_id.clone(),
+                credential_id: credential_id.to_owned(),
                 credential_public_key: CredentialPublicKey {
                     key_type: key_info.key_type(),
                     alg: alg.into(),
@@ -302,7 +302,8 @@ impl WebauthnAuthenticator {
 
         let auth_data_bytes = Self::generate_authenticator_data(rp_id, attestation_flags, None)?.to_vec()?;
 
-        let challenge = base64::decode(credential_request_options.challenge)?;
+        let challenge = base64::decode(credential_request_options.challenge.as_str())
+            .or(base64::decode_config(credential_request_options.challenge, URL_SAFE_NO_PAD))?;
         let collected_client_data = CollectedClientData {
             request_type: WEBAUTHN_REQUEST_TYPE_GET.to_owned(),
             challenge: base64::encode_config(challenge, URL_SAFE_NO_PAD),
@@ -374,7 +375,7 @@ impl WebauthnAuthenticator {
                 let signing_key = rsa::pkcs1v15::SigningKey::<Sha256>::new(key);
                 Ok(signing_key.sign([auth_data_bytes, client_data_hash].concat().as_slice()).to_vec())
             }
-            _ => return Err(WebauthnCredentialRequestError::AlgorithmNotSupported),
+            _ => Err(WebauthnCredentialRequestError::AlgorithmNotSupported),
         }
     }
 
@@ -422,9 +423,9 @@ fn test_best_alg() {
     assert_eq!(alg, CoseAlgorithmIdentifier::Ed25519);
 
     let params2 = vec![
-        CoseAlgorithmIdentifier::ES256.into(),
-        CoseAlgorithmIdentifier::RS1.into(),
-        CoseAlgorithmIdentifier::RSA.into(),
+        CoseAlgorithmIdentifier::ES256,
+        CoseAlgorithmIdentifier::RS1,
+        CoseAlgorithmIdentifier::RSA,
     ];
 
     let alg = WebauthnAuthenticator::find_best_supported_algorithm(&params2).unwrap();