From 3881f56b45908306b137073294bfa45c7a11ec2e Mon Sep 17 00:00:00 2001 From: Andras Schmelczer Date: Fri, 4 Apr 2025 21:58:05 +0100 Subject: [PATCH] Bump rust deps --- backend/Cargo.lock | 81 +++++++++++++++---- backend/sync_server/Cargo.toml | 5 +- backend/sync_server/src/config.rs | 8 +- backend/sync_server/src/config/user_config.rs | 4 +- backend/sync_server/src/errors.rs | 10 +-- backend/sync_server/src/server/websocket.rs | 9 +-- 6 files changed, 81 insertions(+), 36 deletions(-) diff --git a/backend/Cargo.lock b/backend/Cargo.lock index 20235b5..b0ee9b5 100644 --- a/backend/Cargo.lock +++ b/backend/Cargo.lock @@ -28,7 +28,7 @@ dependencies = [ "once_cell", "serde", "version_check", - "zerocopy", + "zerocopy 0.7.35", ] [[package]] @@ -1446,9 +1446,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.22" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" [[package]] name = "matchers" @@ -1596,7 +1596,7 @@ dependencies = [ "num-integer", "num-iter", "num-traits", - "rand", + "rand 0.8.5", "smallvec", "zeroize", ] @@ -1799,7 +1799,7 @@ version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" dependencies = [ - "zerocopy", + "zerocopy 0.7.35", ] [[package]] @@ -1867,8 +1867,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha", - "rand_core", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94" +dependencies = [ + "rand_chacha 0.9.0", + "rand_core 0.9.3", + "zerocopy 0.8.24", ] [[package]] @@ -1878,7 +1889,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" +dependencies = [ + "ppv-lite86", + "rand_core 0.9.3", ] [[package]] @@ -1890,6 +1911,15 @@ dependencies = [ "getrandom 0.2.15", ] +[[package]] +name = "rand_core" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" +dependencies = [ + "getrandom 0.3.2", +] + [[package]] name = "reconcile" version = "0.3.5" @@ -1967,7 +1997,7 @@ dependencies = [ "num-traits", "pkcs1", "pkcs8", - "rand_core", + "rand_core 0.6.4", "signature", "spki", "subtle", @@ -2207,7 +2237,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ "digest", - "rand_core", + "rand_core 0.6.4", ] [[package]] @@ -2380,7 +2410,7 @@ dependencies = [ "memchr", "once_cell", "percent-encoding", - "rand", + "rand 0.8.5", "rsa", "serde", "sha1", @@ -2420,7 +2450,7 @@ dependencies = [ "md-5", "memchr", "once_cell", - "rand", + "rand 0.8.5", "serde", "serde_json", "sha2", @@ -2537,8 +2567,7 @@ dependencies = [ "clap-verbosity-flag", "futures", "log", - "rand", - "reconcile", + "rand 0.9.0", "regex", "sanitize-filename", "schemars", @@ -2895,7 +2924,7 @@ dependencies = [ "http", "httparse", "log", - "rand", + "rand 0.8.5", "sha1", "thiserror 1.0.69", "utf-8", @@ -3404,7 +3433,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "byteorder", - "zerocopy-derive", + "zerocopy-derive 0.7.35", +] + +[[package]] +name = "zerocopy" +version = "0.8.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2586fea28e186957ef732a5f8b3be2da217d65c5969d4b1e17f973ebbe876879" +dependencies = [ + "zerocopy-derive 0.8.24", ] [[package]] @@ -3418,6 +3456,17 @@ dependencies = [ "syn 2.0.90", ] +[[package]] +name = "zerocopy-derive" +version = "0.8.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a996a8f63c5c4448cd959ac1bab0aaa3306ccfd060472f85943ee0750f0169be" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + [[package]] name = "zerofrom" version = "0.1.5" diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml index 4c8c655..cce5b63 100644 --- a/backend/sync_server/Cargo.toml +++ b/backend/sync_server/Cargo.toml @@ -7,7 +7,6 @@ license.workspace = true repository.workspace = true [dependencies] -reconcile = { path = "../reconcile" } sync_lib = { path = "../sync_lib" } serde = { workspace = true } @@ -15,7 +14,7 @@ thiserror = { workspace = true } tokio = { version = "1.44.1", features = ["full"]} uuid = { version = "1.16.0", features = ["v4", "serde"] } -log = { version = "0.4.22" } +log = { version = "0.4.27" } anyhow = { version = "1.0.97", features = ["backtrace"] } axum = { version = "0.7.4", features = ["ws", "macros", "tracing", "multipart"]} axum-extra = { version = "0.9.6", features = ["typed-header"] } @@ -29,7 +28,7 @@ chrono = { version = "0.4.40", features = ["serde"] } aide = { version = "0.13.4", features = ["axum", "axum-ws", "scalar", "axum-headers"] } schemars = { version = "0.8.21", features = ["chrono", "uuid1", "bytes"] } tracing = "0.1.41" -rand = "0.8.5" +rand = "0.9.0" sanitize-filename = "0.6.0" axum-jsonschema = { version = "0.8.0", features = ["aide"] } regex = "1.11.1" diff --git a/backend/sync_server/src/config.rs b/backend/sync_server/src/config.rs index 862dd0e..8e4dcef 100644 --- a/backend/sync_server/src/config.rs +++ b/backend/sync_server/src/config.rs @@ -26,16 +26,16 @@ impl Config { pub async fn read_or_create(path: &Path) -> Result { if path.exists() { info!( - "Loading configuration from {:?}", - path.canonicalize().unwrap() + "Loading configuration from '{}'", + path.canonicalize().unwrap().display() ); Self::load_from_file(path).await } else { let config = Self::default(); config.write(path).await?; warn!( - "Configuration file not found, wrote default configuration to {:?}", - path.canonicalize().unwrap() + "Configuration file not found, wrote default configuration to '{}'", + path.canonicalize().unwrap().display() ); Ok(config) } diff --git a/backend/sync_server/src/config/user_config.rs b/backend/sync_server/src/config/user_config.rs index fea8089..2450c3a 100644 --- a/backend/sync_server/src/config/user_config.rs +++ b/backend/sync_server/src/config/user_config.rs @@ -1,4 +1,4 @@ -use rand::{Rng as _, distributions::Alphanumeric, thread_rng}; +use rand::{Rng, distr::Alphanumeric, rng}; use serde::{Deserialize, Serialize}; use crate::app_state::database::models::VaultId; @@ -53,7 +53,7 @@ fn default_users() -> Vec { } pub fn get_random_token() -> String { - thread_rng() + rng() .sample_iter(&Alphanumeric) .take(64) .map(char::from) diff --git a/backend/sync_server/src/errors.rs b/backend/sync_server/src/errors.rs index 69b38d2..a16f713 100644 --- a/backend/sync_server/src/errors.rs +++ b/backend/sync_server/src/errors.rs @@ -105,26 +105,26 @@ pub const fn init_error(error: anyhow::Error) -> SyncServerError { } pub fn server_error(error: anyhow::Error) -> SyncServerError { - error!("Server error: {:?}", error); + error!("Server error: {error:?}"); SyncServerError::ServerError(error) } pub fn client_error(error: anyhow::Error) -> SyncServerError { - info!("Client error: {:?}", error); + info!("Client error: {error:?}"); SyncServerError::ClientError(error) } pub fn not_found_error(error: anyhow::Error) -> SyncServerError { - info!("Not found: {:?}", error); + info!("Not found: {error:?}"); SyncServerError::NotFound(error) } pub fn unauthenticated_error(error: anyhow::Error) -> SyncServerError { - info!("Unauthenticated user: {:?}", error); + info!("Unauthenticated user: {error:?}"); SyncServerError::Unauthenticated(error) } pub fn permission_denied_error(error: anyhow::Error) -> SyncServerError { - info!("Permission denied: {:?}", error); + info!("Permission denied: {error:?}"); SyncServerError::PermissionDeniedError(error) } diff --git a/backend/sync_server/src/server/websocket.rs b/backend/sync_server/src/server/websocket.rs index d672b94..aa5bc88 100644 --- a/backend/sync_server/src/server/websocket.rs +++ b/backend/sync_server/src/server/websocket.rs @@ -50,18 +50,15 @@ async fn websocket_wrapped( vault_id: VaultId, since_update_id: Option, ) { - info!("Websocket connection opened on vault '{}'", vault_id); + info!("Websocket connection opened on vault '{vault_id}'"); let result = websocket(state, stream, vault_id.clone(), since_update_id).await; if let Err(err) = result { - error!( - "Websocket connection error on vault '{}': {}", - vault_id, err - ); + error!("Websocket connection error on vault '{vault_id}': {err}"); } - warn!("Websocket connection closed on vault '{}'", vault_id); + warn!("Websocket connection closed on vault '{vault_id}'"); } async fn websocket(