Merge pull request 'Update Rust crate zxcvbn to v3' (#12) from renovate/zxcvbn-3.x into develop

Reviewed-on: #12

Cargo.toml

@@ -13,7 +13,7 @@ config = "./spellcheck.toml"
 [dependencies]
 # Errors
 anyhow = "1.0.75"
-thiserror = "1.0.50"
+thiserror = "2.0.0"
 
 # Async
 async-std = "1.12.0"
@@ -26,12 +26,12 @@ tokio-stream = "0.1.15"
 # Utils
 base64 = "0.22.0"
 const_format = "0.2.32"
-rand = "0.8.5"
+rand = "0.9.1"
 validator = { version = "0.17.0", features = ["derive"] }
 # Http client
-reqwest = "0.11.24"
+reqwest = "0.12.0"
 # Password strength estimation
-zxcvbn = "2.2.2"
+zxcvbn = { version = "3.0.0", features = ["ser"] }
 # Image processing/conversion
 image = "0.25.1"
 # Get the application version
@@ -44,13 +44,16 @@ tracing = "0.1.40"
 tracing-forest = "0.1.6"
 
 # SCSS -> CSS + usage in rust code
-turf = "0.9.3"
+turf = "0.10.0"
 
 # Dioxus
 dioxus-free-icons = { version = "0.9", features = ["ionicons", "font-awesome-solid"] }
 modx = "0.1.4"
 
 [target.'cfg(target_family = "wasm")'.dependencies]
+# Utils
+getrandom = { version = "0.3.2", features = ["wasm_js"] }
+
 # Logging/tracing
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
 tracing-web = "0.1.3"
@@ -65,6 +68,7 @@ matrix-sdk = { git = "https://github.com/matrix-org/matrix-rust-sdk.git", rev =
 [target.'cfg(not(target_family = "wasm"))'.dependencies]
 # Utils
 time = "0.3.36"
+getrandom = { version = "0.3.2" }
 
 # Logging/tracing
 tracing-subscriber = { version = "0.3.18", features = ["env-filter", "time"] }
@@ -75,9 +79,24 @@ dioxus = { version = "0.6.3", features = ["desktop"] }
 # Matrix
 matrix-sdk = { git = "https://github.com/matrix-org/matrix-rust-sdk.git", rev = "fa6066b8", default-features = false, features = ["rustls-tls"] }
 
+[target.wasm32-unknown-unknown]
+rustflags = ['--cfg', 'getrandom_backend="wasm_js"']
+
 [build-dependencies]
 regex = "1.10.3"
 
+[profile]
+
+[profile.wasm-dev]
+inherits = "dev"
+opt-level = 1
+
+[profile.server-dev]
+inherits = "dev"
+
+[profile.android-dev]
+inherits = "dev"
+
 [package.metadata.turf]
 minify = true
 

Dockerfile

@@ -14,6 +14,8 @@ RUN apt update \
 
 COPY . .
 
+# Workaround waiting for the dioxus 0.7 release (cf. https://github.com/DioxusLabs/dioxus/issues/4238)
+ENV RUSTFLAGS="--cfg getrandom_backend=\"wasm_js\""
 RUN dx build -r --platform web -- -j ${JOBS_NB}
 
 

build.rs

@@ -124,7 +124,7 @@ fn export_variables(tasks: Vec<Task>) {
             "#[allow(dead_code)]\nmod {} {{\n",
             task.module_name
         )) {
-            println!("{}", err);
+            println!("{err}");
             return;
         };
 
@@ -143,14 +143,14 @@ fn export_variables(tasks: Vec<Task>) {
         }
 
         for variable in variables {
-            if let Err(err) = dst_file.write_fmt(format_args!("    pub {}\n", variable)) {
+            if let Err(err) = dst_file.write_fmt(format_args!("    pub {variable}\n")) {
-                println!("{}", err);
+                println!("{err}");
                 break;
             }
         }
 
         if let Err(err) = dst_file.write(b"}\n") {
-            println!("{}", err);
+            println!("{err}");
         };
     }
 }

docker/Dockerfile.ci-lint-audit

@@ -1,4 +1,4 @@
-FROM rust:1.86 AS builder
+FROM rust:1.88 AS builder
 
 RUN apt update \
     && apt install -y --no-install-recommends libclang-dev hunspell \

src/infrastructure/services/random_svg_generators.rs

@@ -3,7 +3,7 @@ use std::future::Future;
 use std::sync::OnceLock;
 use std::{collections::HashMap, future::IntoFuture};
 
-use rand::distributions::{Alphanumeric, DistString};
+use rand::distr::{Alphanumeric, SampleString};
 use reqwest::Result as RequestResult;
 use tracing::error;
 
@@ -124,7 +124,7 @@ async fn fetch_dicebear_svg(
     // TODO: Use configuration file
     let url = "dicebear.tools.adrien.run";
 
-    let seed = Alphanumeric.sample_string(&mut rand::thread_rng(), 16);
+    let seed = Alphanumeric.sample_string(&mut rand::rng(), 16);
     let type_str = r#type.to_string();
     let url = format!(
         "https://{url}/8.x/{type_str}/svg?seed={seed}&randomizeIds=true{}{}",

src/ui/components/login.rs

@@ -4,7 +4,7 @@ use const_format::formatcp;
 use dioxus::prelude::*;
 use tracing::{debug, error, warn};
 use validator::{Validate, ValidateArgs, ValidateEmail, ValidationError, ValidationErrors};
-use zxcvbn::zxcvbn;
+use zxcvbn::{zxcvbn, Score};
 
 use crate::{
     domain::model::session::Session,
@@ -348,14 +348,14 @@ fn validate_id(id: &Option<String>, process: &Process) -> Result<(), ValidationE
 }
 
 struct PasswordValidationResult {
-    score: u8,
+    score: Score,
     rating: f64, // 0 <= rating <= 1
     suggestions: Vec<String>,
 }
 impl PasswordValidationResult {
     pub fn new() -> Self {
         PasswordValidationResult {
-            score: 0,
+            score: Score::Zero,
             rating: 0.0,
             suggestions: Vec::<String>::new(),
         }
@@ -366,9 +366,7 @@ fn compute_password_score(
     password: &str,
     with_suggestions: Option<bool>,
 ) -> Option<PasswordValidationResult> {
-    let Ok(estimate) = zxcvbn(password, &[]) else {
+    let estimate = zxcvbn(password, &[]);
-        return None;
-    };
 
     let mut result = PasswordValidationResult::new();
     result.score = estimate.score();
@@ -396,7 +394,7 @@ fn validate_password(password: &Option<String>, process: &Process) -> Result<(),
         if let Some(password) = password {
             if let Some(result) = compute_password_score(password, Some(true)) {
                 // TODO: To configuration?
-                if result.score <= 2 {
+                if [Score::Zero, Score::One, Score::Two].contains(&result.score) {
                     let mut err = ValidationError::new(TOO_WEAK_PASSWORD_ERROR_NAME);
                     err.add_param(Cow::from("score"), &result.score);
                     err.add_param(Cow::from("rating"), &result.rating);