Cargo.toml maintenance

Cargo.toml

@@ -6,10 +6,10 @@ members = ["credentialsd", "credentialsd-common", "credentialsd-ui"]
 lto = true
 
 [workspace.dependencies]
-futures-lite = "2.6.0"
-libc = "0.2.186"
-serde = { version = "1.0.219", features = ["derive"] }
-tracing = "0.1.41"
-tracing-subscriber = "0.3.19"
-zbus = { version = "5.9.0", default-features = false }
-zvariant = "5.6.0"
+futures-lite = "=2.6.1"
+libc = "=0.2.189"
+serde = { version = "=1.0.229", features = ["derive"] }
+tracing = "=0.1.44"
+tracing-subscriber = "=0.3.23"
+zbus = { version = "=5.18.0", default-features = false }
+zvariant = "=5.13.1"

credentialsd-common/Cargo.toml

@@ -10,5 +10,6 @@ futures-lite.workspace = true
 libc.workspace = true
 serde = { workspace = true, features = ["derive"] }
 tracing.workspace = true
-zeroize = "1.9.0"
 zvariant.workspace = true
+
+zeroize = "=1.9.0"

credentialsd-ui/Cargo.toml

@@ -10,16 +10,17 @@ default = ["wayland"]
 wayland = ["gdk-wayland"]
 
 [dependencies]
-async-std = { version = "1.13.1", features = ["unstable"] }
 credentialsd-common = { path = "../credentialsd-common" }
+
 futures-lite.workspace = true
-gettext-rs = { version = "0.7", features = ["gettext-system"] }
-gtk = { version = "0.10.3", package = "gtk4", features = ["v4_14"] }
-gdk-wayland = { version = "0.10.3", package = "gdk4-wayland", optional = true }
-qrcode = "0.14.1"
 serde.workspace = true
 tracing.workspace = true
-tracing-subscriber = "0.3.19"
-zeroize = { version = "1.8.2" }
+tracing-subscriber.workspace = true
 zbus = { workspace = true, default-features = false, features = ["async-io"]}
-gio-unix = "0.22.6"
+
+async-std = { version = "=1.13.2", features = ["unstable"] }
+gettext-rs = { version = "=0.7.7", features = ["gettext-system"] }
+gio-unix = "=0.22.8"
+gtk = { version = "=0.11.4", package = "gtk4", features = ["v4_14"] }
+gdk-wayland = { version = "=0.11.4", package = "gdk4-wayland", optional = true }
+qrcode = "=0.14.1"

credentialsd/Cargo.toml

@@ -2,30 +2,30 @@
 name = "credentialsd"
 version = "0.2.0"
 authors = ["Isaiah Inuwa <isaiah.inuwa@gmail.com>", "Martin Sirringhaus <martin.sirringhaus@suse.com>", "Alfie Fresta <alfie.fresta@gmail.com>"]
-edition = "2021"
+edition = "2024"
 license = "LGPL-3.0-only"
 
 [dependencies]
-async-stream = "0.3.6"
-async-trait = "0.1.89"
-base64 = "0.22.1"
 credentialsd-common = { path = "../credentialsd-common" }
-futures = "0.3.32"
+
 futures-lite.workspace = true
-libwebauthn = { version = "0.8.0", features = ["nfc-backend-libnfc", "nfc-backend-pcsc", "reqwest-related-origins-source"] }
-# 0.6.1 fails to build with non-vendored library.
-# https://github.com/alexrsagen/rs-nfc1/issues/15
-nfc1 = { version = "=0.6.0", default-features = false }
-rand = "0.9.2"
-ring = "0.17.14"
 serde.workspace = true
-serde_json = "1.0.140"
-tokio = { version = "1.45.0", features = ["rt-multi-thread"] }
-tokio-stream = "0.1.18"
 tracing.workspace = true
 tracing-subscriber.workspace = true
 zbus = { workspace = true, default-features = false, features = ["tokio"] }
 
+async-stream = "=0.3.6"
+async-trait = "=0.1.91"
+base64 = "=0.22.1"
+futures = "=0.3.33"
+libwebauthn = { version = "=0.10.0", features = ["nfc-backend-libnfc", "nfc-backend-pcsc", "reqwest-related-origins-source"] }
+nfc1 = { version = "=0.7.1", default-features = false }
+rand = "=0.10.2"
+ring = "=0.17.14"
+serde_json = "=1.0.151"
+tokio = { version = "=1.53.1", features = ["rt-multi-thread"] }
+tokio-stream = "=0.1.19"
+
 [dev-dependencies]
-gio = "0.21.0"
-zbus = { version = "5.9.0", default-features = false, features = ["blocking-api", "tokio"] }
+gio = "=0.22.8"
+zbus = { version = "=5.18.0", default-features = false, features = ["blocking-api", "tokio"] }

credentialsd/src/credential_service/hybrid.rs

@@ -14,7 +14,7 @@ use libwebauthn::transport::cable::qr_code_device::{
     CableQrCodeDevice, CableTransports, QrCodeOperationHint,
 };
 use libwebauthn::transport::{Channel, ChannelSettings, Device};
-use libwebauthn::webauthn::{Error as WebAuthnError, WebAuthn};
+use libwebauthn::webauthn::{error::WebAuthnError, WebAuthn};
 
 use credentialsd_common::{
     memfd::write_secret,
@@ -276,10 +276,9 @@ async fn handle_hybrid_updates(
                 }
             },
         };
-        if let Some(state) = new_state {
-            if let Err(err) = state_sender.send(state.clone()).await {
+        if let Some(state) = new_state
+            && let Err(err) = state_sender.send(state.clone()).await {
                 error!({ ?err, ?state }, "Failed to send hybrid update");
             }
-        }
     }
 }

credentialsd/src/credential_service/mod.rs

@@ -180,8 +180,8 @@ impl<H: HybridHandler + Send, N: NfcHandler + Send, U: UsbHandler + Send> Manage
 
     async fn cancel_request(&self, request_id: RequestId) {
         let mut guard = self.ctx.lock().expect("Lock to be taken");
-        if let Some(ctx) = guard.take_if(|ctx| ctx.request_id == request_id) {
-            if request_id == ctx.request_id {
+        if let Some(ctx) = guard.take_if(|ctx| ctx.request_id == request_id)
+            && request_id == ctx.request_id {
                 tracing::debug!("Cancelling request {request_id}");
                 // TODO: cancel sub-tasks: hybrid and USB streams.
 
@@ -193,7 +193,6 @@ impl<H: HybridHandler + Send, N: NfcHandler + Send, U: UsbHandler + Send> Manage
                         "Cancelled request {request_id}."
                     ))));
             }
-        }
     }
 
     async fn get_available_public_key_devices(&self) -> Result<Vec<Device>, ()> {
@@ -391,10 +390,13 @@ impl From<UsbState> for DeviceStateUpdate {
 }
 
 fn complete_request(ctx: &Mutex<Option<RequestContext>>, response: CredentialResponse) {
-    if let Some(ctx) = ctx.lock().unwrap().take() {
-        ctx.send_response(Ok(response));
-    } else {
-        tracing::error!("Tried to consume context to respond to caller, but none was found.")
+    match ctx.lock().unwrap().take() {
+        Some(ctx) => {
+            ctx.send_response(Ok(response));
+        }
+        _ => {
+            tracing::error!("Tried to consume context to respond to caller, but none was found.")
+        }
     }
 }
 

credentialsd/src/credential_service/nfc.rs

@@ -7,7 +7,7 @@ use libwebauthn::{
     ops::webauthn::GetAssertionResponse,
     proto::CtapError,
     transport::{nfc::device::NfcDevice, Channel, ChannelSettings, Device},
-    webauthn::{Error as WebAuthnError, WebAuthn},
+    webauthn::{error::WebAuthnError, WebAuthn},
     UvUpdate,
 };
 use tokio::sync::broadcast;

credentialsd/src/credential_service/usb.rs

@@ -10,7 +10,7 @@ use libwebauthn::{
         hid::{channel::HidChannelHandle, HidDevice},
         Channel, ChannelSettings, Device,
     },
-    webauthn::{Error as WebAuthnError, WebAuthn},
+    webauthn::{error::WebAuthnError, WebAuthn},
     UvUpdate,
 };
 use tokio::sync::{

credentialsd/src/dbus/flow_control.rs

@@ -228,11 +228,11 @@ async fn handle<M: ManageDevice + Debug + Send + Sync + 'static, UC: UiControlle
         }
     });
     tracing::debug!("Finished setting up request {request_id}");
-    let cred_response = request_rx
-        .await
-        .expect("Credential service not to drop request channel before responding.");
+
 
-    cred_response
+    request_rx
+        .await
+        .expect("Credential service not to drop request channel before responding.")
 }
 
 fn forward_background_event_stream(