chore: centralize and upgrade shared Cargo dependencies

Move duplicated Cargo dependencies to the root workspace manifest, switch member crates to workspace dependencies, and align non-conflicting shared feature sets at the workspace level.

Upgrade a number of shared dependencies while consolidating versions across the workspace. This also consolidates the ldap3 dependency in response to GHSA-qcxq-75wr-5cm8: https://github.com/kanidm/ldap3/security/advisories/GHSA-qcxq-75wr-5cm8

Update frontend and migration code for dependency upgrades and clean up manifest structure.

Cargo.toml

@@ -24,9 +24,122 @@ lto = true
 [profile.release.package.lldap_app]
 opt-level = 's'
 
+[workspace.dependencies.anyhow]
+version = "1"
+
+[workspace.dependencies.async-trait]
+version = "0.1"
+
+[workspace.dependencies.base64]
+version = "0.22"
+
+[workspace.dependencies.bincode]
+version = "1"
+
+[workspace.dependencies.chrono]
+version = "0.4"
+features = ["serde", "wasmbind"]
+
+[workspace.dependencies.clap]
+version = "4"
+features = ["std", "color", "suggestions", "derive", "env"]
+
+[workspace.dependencies.derive_more]
+version = "2"
+default-features = false
+features = ["debug", "display", "from", "from_str"]
+
+[workspace.dependencies.graphql_client]
+version = "0.11"
+default-features = false
+features = ["graphql_query_derive"]
+
+[workspace.dependencies.image]
+version = "0.25"
+default-features = false
+features = ["jpeg"]
+
+[workspace.dependencies.itertools]
+version = "0.14"
+
+[workspace.dependencies.juniper]
+version = "0.15"
+default-features = false
+features = ["chrono", "schema-language", "url", "uuid"]
+
+[workspace.dependencies.ldap3]
+version = "0"
+default-features = false
+features = ["sync", "tls-rustls-ring"]
+
+[workspace.dependencies.ldap3_proto]
+version = "0.7"
+
+[workspace.dependencies.jwt]
+version = "0.16"
+
+[workspace.dependencies.log]
+version = "0"
+
+[workspace.dependencies.mockall]
+version = "0.14"
+
+[workspace.dependencies.opaque-ke]
+version = "0.7"
+
+[workspace.dependencies.orion]
+version = "0.17"
+
+[workspace.dependencies.pretty_assertions]
+version = "1"
+
+[workspace.dependencies.rand]
+version = "0.8"
+features = ["small_rng", "getrandom"]
+
+[workspace.dependencies.reqwest]
+version = "0.11"
+default-features = false
+
 [workspace.dependencies.sea-orm]
 version = "1.1.8"
 default-features = false
+features = ["macros", "with-chrono", "with-uuid", "sqlx-all", "runtime-actix-rustls"]
+
+[workspace.dependencies.secstr]
+version = "0"
+features = ["serde"]
 
 [workspace.dependencies.serde]
 version = "1"
+
+[workspace.dependencies.serde_bytes]
+version = "0.11"
+
+[workspace.dependencies.serde_json]
+version = "1"
+
+[workspace.dependencies.strum]
+version = "0.28"
+features = ["derive"]
+
+[workspace.dependencies.thiserror]
+version = "2"
+
+[workspace.dependencies.tokio]
+version = "1"
+features = ["full"]
+
+[workspace.dependencies.tracing]
+version = "0"
+
+[workspace.dependencies.tracing-subscriber]
+version = "0.3"
+features = ["env-filter", "tracing-log"]
+
+[workspace.dependencies.urlencoding]
+version = "2"
+
+[workspace.dependencies.uuid]
+version = "1.18.1"
+features = ["js", "serde", "v1", "v3", "v4"]

app/Cargo.toml

@@ -11,27 +11,33 @@ repository.workspace = true
 rust-version.workspace = true
 
 [dependencies]
-anyhow = "1"
-base64 = "0.13"
-gloo-console = "0.2.3"
-gloo-file = "0.2.3"
-gloo-net = "*"
-graphql_client = "0.10"
-http = "0.2"
-jwt = "0.13"
-rand = "0.8"
-serde_json = "1"
+anyhow = { workspace = true }
+chrono = { workspace = true }
+derive_more = { workspace = true }
+gloo-console = "0.4"
+gloo-file = "0.4"
+gloo-net = "0.7"
+graphql_client = { workspace = true }
+image = { workspace = true }
+jwt = { workspace = true }
+rand = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+strum = { workspace = true }
 url-escape = "0.1.1"
 validator = "0.14"
 validator_derive = "0.14"
 wasm-bindgen = "0.2.100"
-wasm-bindgen-futures = "*"
+wasm-bindgen-futures = "0"
 yew = "0.19.3"
 yew-router = "0.16"
 
 # Needed because of https://github.com/tkaitchuck/aHash/issues/95
 indexmap = "=1.6.2"
 
+base64 = { workspace = true }
+
+
 [dependencies.web-sys]
 version = "0.3"
 features = [
@@ -50,17 +56,6 @@ features = [
   "console",
 ]
 
-[dependencies.chrono]
-version = "*"
-features = [
-  "wasmbind"
-]
-
-[dependencies.derive_more]
-features = ["debug", "display", "from", "from_str"]
-default-features = false
-version = "1"
-
 [dependencies.lldap_auth]
 path = "../crates/auth"
 features = [ "opaque_client" ]
@@ -71,18 +66,6 @@ path = "../crates/frontend-options"
 [dependencies.lldap_validation]
 path = "../crates/validation"
 
-[dependencies.image]
-features = ["jpeg"]
-default-features = false
-version = "0.24"
-
-[dependencies.serde]
-workspace = true
-
-[dependencies.strum]
-features = ["derive"]
-version = "0.25"
-
 [dependencies.yew_form]
 git = "https://github.com/jfbilodeau/yew_form"
 rev = "4b9fabffb63393ec7626a4477fd36de12a07fac9"

app/src/components/create_group.rs

@@ -112,7 +112,7 @@ impl CommonComponent<CreateGroupForm> for CreateGroupForm {
                 let model = self.form.model();
                 let req = create_group::Variables {
                     group: create_group::CreateGroupInput {
-                        displayName: model.groupname,
+                        display_name: model.groupname,
                         attributes,
                     },
                 };

app/src/components/create_user.rs

@@ -143,9 +143,9 @@ impl CommonComponent<CreateUserForm> for CreateUserForm {
                     user: create_user::CreateUserInput {
                         id: model.username,
                         email: None,
-                        displayName: None,
-                        firstName: None,
-                        lastName: None,
+                        display_name: None,
+                        first_name: None,
+                        last_name: None,
                         avatar: None,
                         attributes,
                     },

app/src/components/form/file_input.rs

@@ -1,6 +1,7 @@
 use std::{fmt::Display, str::FromStr};
 
 use anyhow::{Error, Ok, Result, bail};
+use base64::Engine;
 use gloo_file::{
     File,
     callbacks::{FileReader, read_as_bytes},
@@ -54,12 +55,12 @@ fn to_base64(file: &JsFile) -> Result<String> {
             if !is_valid_jpeg(data.as_slice()) {
                 bail!("Chosen image is not a valid JPEG");
             }
-            Ok(base64::encode(data))
+            Ok(base64::engine::general_purpose::STANDARD.encode(data))
         }
         JsFile {
             file: None,
             contents: Some(data),
-        } => Ok(base64::encode(data)),
+        } => Ok(base64::engine::general_purpose::STANDARD.encode(data)),
     }
 }
 
@@ -98,7 +99,7 @@ impl Component for JpegFileInput {
                     .props()
                     .value
                     .as_ref()
-                    .and_then(|x| base64::decode(x).ok()),
+                    .and_then(|x| base64::engine::general_purpose::STANDARD.decode(x).ok()),
             }),
             reader: None,
         }
@@ -111,7 +112,7 @@ impl Component for JpegFileInput {
                 .props()
                 .value
                 .as_ref()
-                .and_then(|x| base64::decode(x).ok()),
+                .and_then(|x| base64::engine::general_purpose::STANDARD.decode(x).ok()),
         });
         self.reader = None;
         true
@@ -230,7 +231,7 @@ impl JpegFileInput {
 }
 
 fn is_valid_jpeg(bytes: &[u8]) -> bool {
-    image::io::Reader::with_format(std::io::Cursor::new(bytes), image::ImageFormat::Jpeg)
+    image::ImageReader::with_format(std::io::Cursor::new(bytes), image::ImageFormat::Jpeg)
         .decode()
         .is_ok()
 }

app/src/components/group_details_form.rs

@@ -248,13 +248,13 @@ impl GroupDetailsForm {
             };
         let mut group_input = update_group::UpdateGroupInput {
             id: self.group.id,
-            displayName: None,
-            removeAttributes: None,
-            insertAttributes: None,
+            display_name: None,
+            remove_attributes: None,
+            insert_attributes: None,
         };
         let default_group_input = group_input.clone();
-        group_input.removeAttributes = remove_attributes;
-        group_input.insertAttributes = insert_attributes;
+        group_input.remove_attributes = remove_attributes;
+        group_input.insert_attributes = insert_attributes;
         // Nothing changed.
         if group_input == default_group_input {
             return Ok(false);

app/src/components/user_details_form.rs

@@ -260,16 +260,16 @@ impl UserDetailsForm {
         let mut user_input = update_user::UpdateUserInput {
             id: self.user.id.clone(),
             email: None,
-            displayName: None,
-            firstName: None,
-            lastName: None,
+            display_name: None,
+            first_name: None,
+            last_name: None,
             avatar: None,
-            removeAttributes: None,
-            insertAttributes: None,
+            remove_attributes: None,
+            insert_attributes: None,
         };
         let default_user_input = user_input.clone();
-        user_input.removeAttributes = remove_attributes;
-        user_input.insertAttributes = insert_attributes;
+        user_input.remove_attributes = remove_attributes;
+        user_input.insert_attributes = insert_attributes;
         // Nothing changed.
         if user_input == default_user_input {
             return Ok(false);

app/src/infra/api.rs

@@ -94,7 +94,7 @@ impl HostService {
     where
         QueryType: GraphQLQuery + 'static,
     {
-        let unwrap_graphql_response = |graphql_client::Response { data, errors }| {
+        let unwrap_graphql_response = |graphql_client::Response { data, errors, .. }| {
             data.ok_or_else(|| {
                 anyhow!(
                     "Errors: [{}]",

crates/access-control/Cargo.toml

@@ -10,8 +10,8 @@ repository.workspace = true
 rust-version.workspace = true
 
 [dependencies]
-tracing = "*"
-async-trait = "0.1"
+tracing = { workspace = true }
+async-trait = { workspace = true }
 
 [dependencies.lldap_auth]
 path = "../auth"

crates/auth/Cargo.toml

@@ -18,35 +18,23 @@ sea_orm = ["dep:sea-orm"]
 test = []
 
 [dependencies]
+chrono = { workspace = true }
+derive_more = { workspace = true }
+opaque-ke = { workspace = true }
+serde = { workspace = true }
 rust-argon2 = "2"
 curve25519-dalek = "3"
 digest = "0.9"
 generic-array = "0.14"
-rand = "0.8"
+rand = { workspace = true }
 sha2 = "0.9"
-thiserror = "2"
-uuid = { version = "1.18.1", features = ["serde"] }
-
-[dependencies.derive_more]
-features = ["debug", "display"]
-default-features = false
-version = "1"
-
-[dependencies.opaque-ke]
-version = "0.7"
-
-[dependencies.chrono]
-version = "*"
-features = ["serde"]
+thiserror = { workspace = true }
+uuid = { workspace = true, features = ["serde"] }
 
 [dependencies.sea-orm]
 workspace = true
-features = ["macros"]
 optional = true
 
-[dependencies.serde]
-workspace = true
-
 # For WASM targets, use the JS getrandom.
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies.getrandom]
 version = "0.2"

crates/domain-handlers/Cargo.toml

@@ -12,22 +12,17 @@ rust-version.workspace = true
 test = []
 
 [dependencies]
-async-trait = "0.1"
-base64 = "0.21"
-ldap3_proto = "0.6.0"
-serde_bytes = "0.11"
+async-trait = { workspace = true }
+base64 = { workspace = true }
+chrono = { workspace = true }
+derive_more = { workspace = true }
+ldap3_proto = { workspace = true }
+serde = { workspace = true }
+serde_bytes = { workspace = true }
+uuid = { workspace = true }
 
 [dev-dependencies]
-pretty_assertions = "1"
-
-[dependencies.chrono]
-features = ["serde"]
-version = "0.4"
-
-[dependencies.derive_more]
-features = ["debug", "display", "from", "from_str"]
-default-features = false
-version = "1"
+pretty_assertions = { workspace = true }
 
 [dependencies.lldap_auth]
 path = "../auth"
@@ -38,10 +33,3 @@ path = "../domain"
 
 [dependencies.lldap_domain_model]
 path = "../domain-model"
-
-[dependencies.serde]
-workspace = true
-
-[dependencies.uuid]
-features = ["v1", "v3"]
-version = "1"

crates/domain-model/Cargo.toml

@@ -12,23 +12,19 @@ rust-version.workspace = true
 test = []
 
 [dependencies]
-base64 = "0.21"
-bincode = "1.3"
-orion = "0.17"
-serde_bytes = "0.11"
-thiserror = "2"
+base64 = { workspace = true }
+bincode = { workspace = true }
+chrono = { workspace = true }
+derive_more = { workspace = true }
+orion = { workspace = true }
+sea-orm = { workspace = true }
+serde = { workspace = true }
+serde_bytes = { workspace = true }
+thiserror = { workspace = true }
+uuid = { workspace = true }
 
 [dev-dependencies]
-pretty_assertions = "1"
-
-[dependencies.chrono]
-features = ["serde"]
-version = "0.4"
-
-[dependencies.derive_more]
-features = ["debug", "display", "from", "from_str"]
-default-features = false
-version = "1"
+pretty_assertions = { workspace = true }
 
 [dependencies.lldap_auth]
 path = "../auth"
@@ -36,14 +32,3 @@ features = ["opaque_server", "opaque_client", "sea_orm"]
 
 [dependencies.lldap_domain]
 path = "../domain"
-
-[dependencies.sea-orm]
-workspace = true
-features = ["macros"]
-
-[dependencies.serde]
-workspace = true
-
-[dependencies.uuid]
-features = ["v1", "v3"]
-version = "1"

crates/domain/Cargo.toml

@@ -15,51 +15,23 @@ rust-version.workspace = true
 test = []
 
 [dependencies]
-anyhow = "*"
-base64 = "0.21"
-bincode = "1.3"
-itertools = "0.10"
-juniper = "0.15"
-serde_bytes = "0.11"
-
-[dev-dependencies]
-pretty_assertions = "1"
-
-[dependencies.chrono]
-features = ["serde"]
-version = "*"
-
-[dependencies.derive_more]
-features = ["debug", "display", "from", "from_str"]
-default-features = false
-version = "1"
-
-[dependencies.image]
-features = ["jpeg"]
-default-features = false
-version = "0.24"
+anyhow = { workspace = true }
+base64 = { workspace = true }
+bincode = { workspace = true }
+chrono = { workspace = true }
+derive_more = { workspace = true }
+image = { workspace = true }
+itertools = { workspace = true }
+juniper = { workspace = true }
+sea-orm = { workspace = true }
+serde = { workspace = true }
+serde_bytes = { workspace = true }
+strum = { workspace = true }
+uuid = { workspace = true }
 
 [dependencies.lldap_auth]
 path = "../auth"
 features = ["opaque_server", "opaque_client", "sea_orm"]
 
-[dependencies.sea-orm]
-workspace = true
-features = [
-    "macros",
-    "with-chrono",
-    "with-uuid",
-    "sqlx-all",
-    "runtime-actix-rustls",
-]
-
-[dependencies.serde]
-workspace = true
-
-[dependencies.strum]
-features = ["derive"]
-version = "0.25"
-
-[dependencies.uuid]
-features = ["v1", "v3"]
-version = "1"
+[dev-dependencies]
+pretty_assertions = { workspace = true }

crates/domain/src/types.rs

@@ -333,7 +333,7 @@ impl TryFrom<&[u8]> for JpegPhoto {
             return Ok(JpegPhoto::null());
         }
         // Confirm that it's a valid Jpeg, then store only the bytes.
-        image::io::Reader::with_format(std::io::Cursor::new(bytes), image::ImageFormat::Jpeg)
+        image::ImageReader::with_format(std::io::Cursor::new(bytes), image::ImageFormat::Jpeg)
             .decode()?;
         Ok(JpegPhoto(bytes.to_vec()))
     }
@@ -346,7 +346,7 @@ impl TryFrom<Vec<u8>> for JpegPhoto {
             return Ok(JpegPhoto::null());
         }
         // Confirm that it's a valid Jpeg, then store only the bytes.
-        image::io::Reader::with_format(
+        image::ImageReader::with_format(
             std::io::Cursor::new(bytes.as_slice()),
             image::ImageFormat::Jpeg,
         )
@@ -397,7 +397,7 @@ impl JpegPhoto {
 
     #[cfg(any(feature = "test", test))]
     pub fn for_tests() -> Self {
-        use image::{ImageOutputFormat, Rgb, RgbImage};
+        use image::{ImageFormat, Rgb, RgbImage};
         let img = RgbImage::from_fn(32, 32, |x, y| {
             if (x + y) % 2 == 0 {
                 Rgb([0, 0, 0])
@@ -406,11 +406,8 @@ impl JpegPhoto {
             }
         });
         let mut bytes: Vec<u8> = Vec::new();
-        img.write_to(
-            &mut std::io::Cursor::new(&mut bytes),
-            ImageOutputFormat::Jpeg(0),
-        )
-        .unwrap();
+        img.write_to(&mut std::io::Cursor::new(&mut bytes), ImageFormat::Jpeg)
+            .unwrap();
         Self(bytes)
     }
 }
@@ -688,7 +685,7 @@ mod tests {
         );
         assert_eq!(
             &format!("{:?}", Serialized::from(&JpegPhoto::for_tests())),
-            "Serialized(\"hash: 0xB947C77A16F3C3BD\")"
+            "Serialized(\"hash: 0xBB3017828B2F3DEF\")"
         );
     }
 

crates/frontend-options/Cargo.toml

@@ -9,5 +9,5 @@ license.workspace = true
 repository.workspace = true
 rust-version.workspace = true
 
-[dependencies.serde]
-workspace = true
+[dependencies]
+serde = { workspace = true }

crates/graphql-server/Cargo.toml

@@ -10,15 +10,14 @@ repository.workspace = true
 rust-version.workspace = true
 
 [dependencies]
-anyhow = "*"
-juniper = "0.15"
-serde_json = "1"
-tracing = "*"
-urlencoding = "2"
-
-[dependencies.chrono]
-features = ["serde"]
-version = "*"
+anyhow = { workspace = true }
+chrono = { workspace = true }
+juniper = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+tracing = { workspace = true }
+urlencoding = { workspace = true }
+uuid = { workspace = true }
 
 [dependencies.lldap_access_control]
 path = "../access-control"
@@ -45,16 +44,10 @@ path = "../sql-backend-handler"
 [dependencies.lldap_validation]
 path = "../validation"
 
-[dependencies.serde]
-workspace = true
-
-[dependencies.uuid]
-features = ["v1", "v3"]
-version = "1"
-
 [dev-dependencies]
-mockall = "0.11.4"
-pretty_assertions = "1"
+mockall = { workspace = true }
+pretty_assertions = { workspace = true }
+tokio = { workspace = true }
 
 #[dev-dependencies.lldap_auth]
 #path = "../auth"
@@ -70,7 +63,3 @@ path = "../test-utils"
 #[dev-dependencies.lldap_sql_backend_handler]
 #path = "../sql-backend-handler"
 #features = ["test"]
-
-[dev-dependencies.tokio]
-features = ["full"]
-version = "1.25"

crates/ldap/Cargo.toml

@@ -10,27 +10,19 @@ repository.workspace = true
 rust-version.workspace = true
 
 [dependencies]
-anyhow = "*"
-ldap3_proto = "0.6.0"
-tracing = "*"
-itertools = "0.10"
+anyhow = { workspace = true }
+tracing = { workspace = true }
+itertools = { workspace = true }
 
-[dependencies.derive_more]
-features = ["from"]
-default-features = false
-version = "1"
+derive_more = { workspace = true }
 
-[dependencies.chrono]
-features = ["serde"]
-version = "*"
+chrono = { workspace = true }
 
-[dependencies.rand]
-features = ["small_rng", "getrandom"]
-version = "0.8"
+rand = { workspace = true }
 
-[dependencies.uuid]
-version = "1"
-features = ["v1", "v3"]
+uuid = { workspace = true }
+
+ldap3_proto = { workspace = true }
 
 [dependencies.lldap_access_control]
 path = "../access-control"
@@ -55,12 +47,10 @@ path = "../opaque-handler"
 path = "../test-utils"
 
 [dev-dependencies]
-mockall = "0.11.4"
-pretty_assertions = "1"
+mockall = { workspace = true }
+pretty_assertions = { workspace = true }
 
-[dev-dependencies.tokio]
-features = ["full"]
-version = "1.25"
+tokio = { workspace = true }
 
 [dev-dependencies.lldap_domain]
 path = "../domain"

crates/opaque-handler/Cargo.toml

@@ -13,7 +13,7 @@ rust-version.workspace = true
 test = []
 
 [dependencies]
-async-trait = "0.1"
+async-trait = { workspace = true }
 
 [dependencies.lldap_auth]
 path = "../auth"
@@ -26,4 +26,4 @@ path = "../domain"
 path = "../domain-model"
 
 [dev-dependencies]
-mockall = "0.11.4"
+mockall = { workspace = true }

crates/sql-backend-handler/Cargo.toml

@@ -13,44 +13,30 @@ rust-version.workspace = true
 test = []
 
 [dependencies]
-anyhow = "*"
-async-trait = "0.1"
-base64 = "0.21"
-bincode = "1.3"
-itertools = "0.10"
-ldap3_proto = "0.6.0"
-orion = "0.17"
-serde_json = "1"
-tracing = "*"
+anyhow = { workspace = true }
+async-trait = { workspace = true }
+itertools = { workspace = true }
+orion = { workspace = true }
+serde_json = { workspace = true }
+tracing = { workspace = true }
 
-[dependencies.chrono]
-features = ["serde"]
-version = "*"
+bincode = { workspace = true }
 
-[dependencies.rand]
-features = ["small_rng", "getrandom"]
-version = "0.8"
+base64 = { workspace = true }
 
-[dependencies.sea-orm]
-workspace = true
-features = [
-    "macros",
-    "with-chrono",
-    "with-uuid",
-    "sqlx-all",
-    "runtime-actix-rustls",
-]
+chrono = { workspace = true }
 
-[dependencies.secstr]
-features = ["serde"]
-version = "*"
+rand = { workspace = true }
 
-[dependencies.serde]
-workspace = true
+sea-orm = { workspace = true }
 
-[dependencies.uuid]
-version = "1"
-features = ["v1", "v3"]
+secstr = { workspace = true }
+
+serde = { workspace = true }
+
+uuid = { workspace = true }
+
+ldap3_proto = { workspace = true }
 
 [dependencies.lldap_access_control]
 path = "../access-control"
@@ -79,14 +65,10 @@ features = ["test"]
 path = "../test-utils"
 
 [dev-dependencies]
-log = "*"
-mockall = "0.11.4"
-pretty_assertions = "1"
+log = { workspace = true }
+mockall = { workspace = true }
+pretty_assertions = { workspace = true }
 
-[dev-dependencies.tokio]
-features = ["full"]
-version = "1.25"
+tokio = { workspace = true }
 
-[dev-dependencies.tracing-subscriber]
-version = "0.3"
-features = ["env-filter", "tracing-log"]
+tracing-subscriber = { workspace = true }

crates/sql-backend-handler/src/sql_migrations.rs

@@ -536,7 +536,7 @@ See https://github.com/lldap/lldap/blob/main/docs/migration_guides/v0.5.md for d
 Conflicting emails:
 "#,
         );
-        for (email, users) in &transaction
+        let duplicate_users = transaction
             .query_all(
                 builder.build(
                     Query::select()
@@ -568,9 +568,8 @@ Conflicting emails:
                     row.try_get::<String>("", &Users::Email.to_string())
                         .unwrap(),
                 )
-            })
-            .group_by(|(_user, email)| email.to_owned())
-        {
+            });
+        for (email, users) in &duplicate_users.chunk_by(|(_user, email)| email.to_owned()) {
             warn!("Email: {email}");
             for (user, _email) in users {
                 warn!("    User: {}", user.as_str());

crates/test-utils/Cargo.toml

@@ -9,14 +9,13 @@ repository.workspace = true
 rust-version.workspace = true
 
 [dependencies]
-async-trait = "0.1"
-ldap3_proto = "0.6.0"
-mockall = "0.11.4"
-tracing = "*"
+async-trait = { workspace = true }
+mockall = { workspace = true }
+tracing = { workspace = true }
 
-[dependencies.uuid]
-version = "1"
-features = ["v1", "v3"]
+uuid = { workspace = true }
+
+ldap3_proto = { workspace = true }
 
 [dependencies.lldap_access_control]
 path = "../access-control"

migration-tool/Cargo.toml

@@ -10,31 +10,24 @@ repository.workspace = true
 rust-version.workspace = true
 
 [dependencies]
-anyhow = "*"
-base64 = "0.13"
-rand = "0.8"
-requestty = "0.4.1"
-serde_json = "1"
-smallvec = "*"
+anyhow = { workspace = true }
+base64 = { workspace = true }
+ldap3 = { workspace = true }
+rand = { workspace = true }
+requestty = "0.6"
+serde = { workspace = true }
+serde_json = { workspace = true }
+smallvec = "1"
 
 [dependencies.lldap_auth]
 path = "../crates/auth"
 features = ["opaque_client"]
 
 [dependencies.graphql_client]
+workspace = true
 features = ["graphql_query_derive", "reqwest-rustls"]
-default-features = false
-version = "0.11"
 
 [dependencies.reqwest]
-version = "*"
+workspace = true
 default-features = false
 features = ["json", "blocking", "rustls-tls"]
-
-[dependencies.ldap3]
-version = "*"
-default-features = false
-features = ["sync", "tls-rustls-ring"]
-
-[dependencies.serde]
-workspace = true

migration-tool/src/ldap.rs

@@ -193,7 +193,9 @@ impl TryFrom<ResultEntry> for User {
                 display_name,
                 first_name,
                 last_name,
-                avatar: avatar.map(base64::encode),
+                avatar: avatar.map(|avatar| {
+                    base64::Engine::encode(&base64::engine::general_purpose::STANDARD, avatar)
+                }),
                 attributes: None,
             },
             password,

server/Cargo.toml

@@ -19,35 +19,46 @@ actix-rt = "2"
 actix-server = "2"
 actix-service = "2"
 actix-web-httpauth = "0.8"
-anyhow = "*"
-async-trait = "0.1"
-bincode = "1.3"
-cron = "*"
-derive_builder = "0.12"
+anyhow = { workspace = true }
+async-trait = { workspace = true }
+bincode = { workspace = true }
+chrono = { workspace = true }
+clap = { workspace = true }
+cron = "0"
+derive_more = { workspace = true }
+derive_builder = "0.20"
 figment_file_provider_adapter = "0.1"
-futures = "*"
-futures-util = "*"
+futures = "0"
+futures-util = "0"
 hmac = "0.12"
-http = "*"
-juniper = "0.15"
-jwt = "0.16"
-ldap3_proto = "0.6.0"
-log = "*"
+juniper = { workspace = true }
+jwt = { workspace = true }
+ldap3_proto = { workspace = true }
+log = { workspace = true }
+opaque-ke = { workspace = true }
+rand = { workspace = true }
 rand_chacha = "0.3"
 rustls-pemfile = "2"
-serde_json = "1"
+sea-orm = { workspace = true }
+secstr = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
 sha2 = "0.10"
-thiserror = "2"
+strum = { workspace = true }
+thiserror = { workspace = true }
 time = "0.3"
+tokio = { workspace = true }
 tokio-rustls = "0.26"
-tokio-stream = "*"
+tokio-stream = "0"
 tokio-util = "0.7"
-tracing = "*"
+tracing = { workspace = true }
 tracing-actix-web = "0.7"
 tracing-attributes = "^0.1.21"
-tracing-log = "*"
-urlencoding = "2"
-webpki-roots = "0.26"
+tracing-log = "0"
+tracing-subscriber = { workspace = true }
+urlencoding = { workspace = true }
+uuid = { workspace = true }
+webpki-roots = "1"
 
 [dependencies.actix-web]
 features = ["rustls-0_23"]
@@ -62,26 +73,9 @@ version = "0.23"
 features = ["std"]
 version = "1"
 
-[dependencies.chrono]
-features = ["serde"]
-version = "*"
-
-[dependencies.clap]
-features = ["std", "color", "suggestions", "derive", "env"]
-version = "4"
-
-[dependencies.derive_more]
-features = ["debug", "display", "from", "from_str"]
-default-features = false
-version = "1"
-
 [dependencies.figment]
 features = ["env", "toml"]
-version = "*"
-
-[dependencies.tracing-subscriber]
-version = "0.3"
-features = ["env-filter", "tracing-log"]
+version = "0"
 
 [dependencies.lettre]
 features = ["builder", "serde", "smtp-transport", "tokio1-rustls-tls"]
@@ -126,52 +120,16 @@ path = "../crates/opaque-handler"
 [dependencies.lldap_validation]
 path = "../crates/validation"
 
-[dependencies.opaque-ke]
-version = "0.7"
-
-[dependencies.rand]
-features = ["small_rng", "getrandom"]
-version = "0.8"
-
-[dependencies.secstr]
-features = ["serde"]
-version = "*"
-
-[dependencies.serde]
-workspace = true
-
-[dependencies.strum]
-features = ["derive"]
-version = "0.25"
-
-[dependencies.tokio]
-features = ["full"]
-version = "1.25"
-
-[dependencies.uuid]
-features = ["v1", "v3", "v4"]
-version = "1"
-
 [dependencies.tracing-forest]
 features = ["smallvec", "chrono", "tokio"]
-version = "^0.1.6"
+version = "0.3"
 
 [dependencies.actix-tls]
 features = ["default", "rustls-0_23"]
 version = "3"
 
-[dependencies.sea-orm]
-workspace = true
-features = [
-    "macros",
-    "with-chrono",
-    "with-uuid",
-    "sqlx-all",
-    "runtime-actix-rustls",
-]
-
 [dependencies.reqwest]
-version = "0.11"
+workspace = true
 default-features = false
 features = ["rustls-tls-webpki-roots"]
 
@@ -180,20 +138,13 @@ version = "2"
 features = ["serde"]
 
 [dev-dependencies]
-assert_cmd = "2.0"
-mockall = "0.11.4"
-nix = "0.26.2"
-pretty_assertions = "1"
-
-[dev-dependencies.graphql_client]
-features = ["graphql_query_derive", "reqwest-rustls"]
-default-features = false
-version = "0.11"
-
-[dev-dependencies.ldap3]
-version = "*"
-default-features = false
-features = ["sync", "tls-rustls-ring"]
+assert_cmd = "2"
+graphql_client = { workspace = true, features = ["graphql_query_derive", "reqwest-rustls"] }
+ldap3 = { workspace = true }
+mockall = { workspace = true }
+nix = { version = "0.31", features = ["process", "signal"] }
+pretty_assertions = { workspace = true }
+uuid = { workspace = true }
 
 [dev-dependencies.lldap_auth]
 path = "../crates/auth"
@@ -211,7 +162,7 @@ path = "../crates/sql-backend-handler"
 features = ["test"]
 
 [dev-dependencies.reqwest]
-version = "*"
+workspace = true
 default-features = false
 features = ["json", "blocking", "rustls-tls"]
 
@@ -220,10 +171,6 @@ version = "2.0.0"
 default-features = false
 features = ["file_locks"]
 
-[dev-dependencies.uuid]
-version = "1"
-features = ["v4"]
-
 [dev-dependencies.figment]
 features = ["test"]
-version = "*"
+version = "0"

set-password/Cargo.toml

@@ -12,22 +12,17 @@ rust-version.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-anyhow = "*"
-rand = "0.8"
-serde_json = "1"
+anyhow = { workspace = true }
+rand = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
 
-[dependencies.clap]
-features = ["std", "color", "suggestions", "derive", "env"]
-version = "4"
+clap = { workspace = true }
 
 [dependencies.lldap_auth]
 path = "../crates/auth"
 features = ["opaque_client"]
 
 [dependencies.reqwest]
-version = "*"
-default-features = false
-features = ["json", "blocking", "rustls-tls", "rustls-tls-native-roots"]
-
-[dependencies.serde]
 workspace = true
+features = ["json", "blocking", "rustls-tls", "rustls-tls-native-roots"]