update rand

sqlpage · Feb 14, 2025 · 9804a66 · 9804a66
1 parent 436ca17
commit 9804a66
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 21 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -52,7 +52,7 @@ markdown = { version = "1.0.0-alpha.15", features = ["log"] }
 password-hash = "0.5.0"
 argon2 = "0.5.0"
 actix-web-httpauth = "0.8.0"
-rand = "0.8.5"
+rand = "0.9.0"
 actix-multipart = "0.7.2"
 base64 = "0.22"
 rustls-acme = "0.9.2"

diff --git a/src/webserver/database/sqlpage_functions/functions.rs b/src/webserver/database/sqlpage_functions/functions.rs
@@ -356,8 +356,8 @@ pub(crate) async fn random_string(len: usize) -> anyhow::Result<String> {
 
 /// Returns a random string of the specified length.
 pub(crate) fn random_string_sync(len: usize) -> String {
-    use rand::{distributions::Alphanumeric, Rng};
-    password_hash::rand_core::OsRng
+    use rand::{distr::Alphanumeric, Rng};
+    rand::rng()
         .sample_iter(&Alphanumeric)
         .take(len)
         .map(char::from)

diff --git a/src/webserver/http.rs b/src/webserver/http.rs
@@ -241,7 +241,7 @@ fn anyhow_err_to_actix_resp(e: &anyhow::Error, env: app_config::DevOrProd) -> Ht
         resp.status(StatusCode::TOO_MANY_REQUESTS)
             .insert_header((
                 header::RETRY_AFTER,
-                header::HeaderValue::from(rand::thread_rng().gen_range(1..=15)),
+                header::HeaderValue::from(rand::rng().random_range(1..=15)),
             ))
             .body("The database is currently too busy to handle your request. Please try again later.\n\n".to_owned() + &body)
     } else {