merge main

policy/Cargo.toml

@@ -16,20 +16,19 @@ serde = { workspace = true, features = ["derive", "rc"] }
 serde_json.workspace = true
 async-trait.workspace = true
 thiserror.workspace = true
-strum = { version = "0.27.1", features = ["derive"] }
+strum = { workspace = true, features = ["derive"] }
 arc-swap = "1.7.1"
 crypto = { path = "../crypto" }
-ipnetwork = { version = "0.21.1", features = ["serde"] }
-itertools = "0.14.0"
+ipnetwork = { workspace = true, features = ["serde"] }
+itertools = { workspace = true }
 futures.workspace = true
 rand.workspace = true
-base64-simd = "0.8.0"
+base64-simd = { workspace = true }
 jsonwebtoken = { workspace = true }
 tracing.workspace = true
 madmin.workspace = true
 lazy_static.workspace = true
-regex = "1.11.1"
-
+regex = { workspace = true }
 
 [dev-dependencies]
 test-case.workspace = true

policy/src/utils.rs

@@ -14,10 +14,10 @@ pub fn gen_access_key(length: usize) -> Result<String> {
     }
 
     let mut result = String::with_capacity(length);
-    let mut rng = rand::thread_rng();
+    let mut rng = rand::rng();
 
     for _ in 0..length {
-        result.push(ALPHA_NUMERIC_TABLE[rng.gen_range(0..ALPHA_NUMERIC_TABLE.len())]);
+        result.push(ALPHA_NUMERIC_TABLE[rng.random_range(0..ALPHA_NUMERIC_TABLE.len())]);
     }
 
     Ok(result)
@@ -29,7 +29,7 @@ pub fn gen_secret_key(length: usize) -> Result<String> {
     if length < 8 {
         return Err(Error::other("secret key length is too short"));
     }
-    let mut rng = rand::thread_rng();
+    let mut rng = rand::rng();
 
     let mut key = vec![0u8; URL_SAFE_NO_PAD.estimated_decoded_length(length)];
     rng.fill_bytes(&mut key);