Skip to content

Commit d59ddc1

Browse files
Feedback: remove unnecessary clone
1 parent 080cfe0 commit d59ddc1

3 files changed

Lines changed: 7 additions & 18 deletions

File tree

credentialsd/src/dbus/gateway.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -250,9 +250,8 @@ impl<C: CredentialRequestController + Send + Sync + 'static> CredentialGateway<C
250250
}
251251
// Find out where this request is coming from (which application is requesting this)
252252
let requesting_app = query_connection_peer_binary(header, connection).await;
253-
let make_cred_request_for_response = make_cred_request.clone();
254253
let cred_request =
255-
CredentialRequest::CreatePublicKeyCredentialRequest(make_cred_request);
254+
CredentialRequest::CreatePublicKeyCredentialRequest(make_cred_request.clone());
256255

257256
let response = self
258257
.controller
@@ -264,7 +263,7 @@ impl<C: CredentialRequestController + Send + Sync + 'static> CredentialGateway<C
264263
if let CredentialResponse::CreatePublicKeyCredentialResponse(cred_response) = response {
265264
let public_key_response = create_credential_response_try_from_ctap2(
266265
&cred_response,
267-
&make_cred_request_for_response,
266+
&make_cred_request,
268267
)
269268
.map_err(|err| {
270269
tracing::error!(
@@ -317,8 +316,7 @@ impl<C: CredentialRequestController + Send + Sync + 'static> CredentialGateway<C
317316
tracing::error!("Could not parse passkey assertion request: {e:?}");
318317
WebAuthnError::TypeError
319318
})?;
320-
let get_cred_request_for_response = get_cred_request.clone();
321-
let cred_request = CredentialRequest::GetPublicKeyCredentialRequest(get_cred_request);
319+
let cred_request = CredentialRequest::GetPublicKeyCredentialRequest(get_cred_request.clone());
322320
// Find out where this request is coming from (which application is requesting this)
323321
let requesting_app = query_connection_peer_binary(header, connection).await;
324322

@@ -332,7 +330,7 @@ impl<C: CredentialRequestController + Send + Sync + 'static> CredentialGateway<C
332330
if let CredentialResponse::GetPublicKeyCredentialResponse(cred_response) = response {
333331
let public_key_response = get_credential_response_try_from_ctap2(
334332
&cred_response,
335-
&get_cred_request_for_response,
333+
&get_cred_request,
336334
)
337335
.map_err(|err| {
338336
tracing::error!(

credentialsd/src/dbus/model.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@ use credentialsd_common::{
1010
},
1111
};
1212

13-
use crate::model::{GetAssertionResponseInternal, MakeCredentialResponseInternal};
14-
use crate::webauthn::{
13+
use libwebauthn::ops::webauthn::{
1514
GetAssertionRequest, MakeCredentialRequest, RelyingPartyId, WebAuthnIDL, WebAuthnIDLResponse,
1615
};
1716

17+
use crate::model::{GetAssertionResponseInternal, MakeCredentialResponseInternal};
18+
1819
/// Parses a WebAuthn create credential request from D-Bus into a CTAP2 MakeCredentialRequest.
1920
///
2021
/// Uses libwebauthn's `WebAuthnIDL::from_json()` for parsing, which handles:

credentialsd/src/webauthn.rs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
//! WebAuthn types re-exported from libwebauthn.
2-
//!
3-
//! This module re-exports the types needed for WebAuthn request parsing
4-
//! and response serialization from the libwebauthn crate.
5-
6-
// Re-exports from libwebauthn
7-
pub use libwebauthn::ops::webauthn::{
8-
GetAssertionRequest, MakeCredentialRequest, RelyingPartyId, WebAuthnIDL, WebAuthnIDLResponse,
9-
};
10-
111
#[derive(Debug)]
122
pub(crate) enum Origin {
133
AppId(String),

0 commit comments

Comments
 (0)