Merge pull request #117 from linux-credentials/libwebauthn-json-2

Use libwebauthn for JSON response serialization

Author: iinuwa

credentialsd/src/cbor.rs

@@ -94,7 +94,7 @@ impl GatewayService {
             // - if RP ID is set, but origin's effective domain doesn't match
             //    - query for related origins, if supported
             //    - fail if not supported, or if RP ID doesn't match any related origins.
-            let (make_cred_request, client_data_json) =
+            let make_cred_request =
                 create_credential_request_try_into_ctap2(&request, &request_environment)
                     .inspect_err(|_| {
                         tracing::error!(
@@ -106,7 +106,7 @@ impl GatewayService {
                 return Err(WebAuthnError::NotSupportedError);
             }
             let cred_request =
-                CredentialRequest::CreatePublicKeyCredentialRequest(make_cred_request);
+                CredentialRequest::CreatePublicKeyCredentialRequest(make_cred_request.clone());
 
             let response = self
                 .request_controller
@@ -115,14 +115,14 @@ impl GatewayService {
 
             if let CredentialResponse::CreatePublicKeyCredentialResponse(cred_response) = response {
                 let public_key_response =
-                    create_credential_response_try_from_ctap2(&cred_response, client_data_json)
+                    create_credential_response_try_from_ctap2(&cred_response, &make_cred_request)
                         .map_err(|err| {
-                            tracing::error!(
-                                "Failed to parse credential response from authenticator: {err}"
-                            );
-                            // Using NotAllowedError as a catch-all error.
-                            WebAuthnError::NotAllowedError
-                        })?;
+                        tracing::error!(
+                            "Failed to parse credential response from authenticator: {err}"
+                        );
+                        // Using NotAllowedError as a catch-all error.
+                        WebAuthnError::NotAllowedError
+                    })?;
                 Ok(public_key_response.into())
             } else {
                 // TODO: is response safe to log here?
@@ -154,14 +154,15 @@ impl GatewayService {
             // - if RP ID is set, but origin's effective domain doesn't match
             //    - query for related origins, if supported
             //    - fail if not supported, or if RP ID doesn't match any related origins.
-            let (get_cred_request, client_data_json) =
+            let get_cred_request =
                 get_credential_request_try_into_ctap2(&request, &request_environment).map_err(
                     |e| {
                         tracing::error!("Could not parse passkey assertion request: {e:?}");
                         WebAuthnError::TypeError
                     },
                 )?;
-            let cred_request = CredentialRequest::GetPublicKeyCredentialRequest(get_cred_request);
+            let cred_request =
+                CredentialRequest::GetPublicKeyCredentialRequest(get_cred_request.clone());
 
             let response = self
                 .request_controller
@@ -170,7 +171,7 @@ impl GatewayService {
 
             if let CredentialResponse::GetPublicKeyCredentialResponse(cred_response) = response {
                 let public_key_response =
-                    get_credential_response_try_from_ctap2(&cred_response, client_data_json)
+                    get_credential_response_try_from_ctap2(&cred_response, &get_cred_request)
                         .map_err(|err| {
                             tracing::error!(
                                 "Failed to parse credential response from authenticator: {err}"