Merge pull request #490 from nextcloud/cargo-updates

update dependencies

Cargo.toml

@@ -5,40 +5,40 @@ name = "notify_push"
 version = "0.1.0" # this version number is unused, the version number for the binary will be extracted from the appinfo/info.xml during build
 authors = ["Robin Appelman <robin@icewind.nl>"]
 edition = "2021"
-rust-version = "1.74.0"
+rust-version = "1.74.1"
 
 [dependencies]
-redis = { version = "0.25.4", default-features = false, features = ["tokio-comp", "aio", "cluster", "cluster-async", "keep-alive"] }
-serde = { version = "1.0.203", features = ["derive"] }
-serde_json = "1.0.117"
-thiserror = "1.0.61"
+redis = { version = "0.26.0", default-features = false, features = ["tokio-comp", "aio", "cluster", "cluster-async", "keep-alive"] }
+serde = { version = "1.0.204", features = ["derive"] }
+serde_json = "1.0.120"
+thiserror = "1.0.63"
 warp = { version = "0.3.7", features = ["tls"] }
-tokio = { version = "1.38.0", features = ["macros", "rt-multi-thread", "signal"] }
+tokio = { version = "1.39.1", features = ["macros", "rt-multi-thread", "signal"] }
 futures = "0.3.30"
-log = "0.4.21"
-sqlx = { version = "0.7.4", features = ["runtime-tokio-rustls", "any", "mysql", "sqlite", "postgres"] }
+log = "0.4.22"
+sqlx = { version = "0.8.0", features = ["runtime-tokio-rustls", "any", "mysql", "sqlite", "postgres"] }
 dotenvy = "0.15.7"
-dashmap = "5.5.3"
+dashmap = "6.0.1"
 once_cell = "1.19.0"
 miette = { version = "7.2.0", features = ["fancy"] }
 smallvec = { version = "1.13.2", features = ["serde"] }
-reqwest = { version = "0.11.27", default-features = false, features = ["rustls-tls", "json"] }
+reqwest = { version = "0.12.5", default-features = false, features = ["rustls-tls", "json"] }
 warp-real-ip = "0.2.0"
 parse-display = "0.9.1"
 percent-encoding = "2.3.1"
 rand = { version = "0.8.5", features = ["small_rng"] }
 ahash = "0.8.11"
-flexi_logger = { version = "0.28.1", features = ["colors", "is-terminal"] }
+flexi_logger = { version = "0.28.5", features = ["colors"] }
 tokio-stream = { version = "0.1.15", features = ["net"] }
 derivative = "2.2.0"
-nextcloud-config-parser = { version = "0.10.0", features = ["redis-connect"] }
-url = "2.5.0"
-clap = { version = "4.5.4", features = ["derive"] }
-sd-notify = { version = "0.4.1", optional = true }
+nextcloud-config-parser = { version = "0.11.0", features = ["redis-connect"] }
+url = "2.5.2"
+clap = { version = "4.5.11", features = ["derive"] }
+sd-notify = { version = "0.4.2", optional = true }
 
 [dev-dependencies]
 mini-redis = "0.4.1"
-tokio-tungstenite = "0.21.0"
+tokio-tungstenite = "0.23.1"
 http-auth-basic = "0.3.3"
 test_client = { path = "test_client" }
 

src/nc.rs

@@ -2,13 +2,13 @@
  * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
- 
+
 use crate::error::{AuthenticationError, NextCloudError};
 use crate::{Result, UserId};
+use reqwest::header::HeaderName;
 use reqwest::{Response, StatusCode, Url};
 use std::fmt::Write;
 use std::net::IpAddr;
-use warp::http::HeaderName;
 
 static X_FORWARDED_FOR: HeaderName = HeaderName::from_static("x-forwarded-for");
 

src/storage_mapping.rs

@@ -2,7 +2,7 @@
  * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
- 
+
 use crate::error::DatabaseError;
 use crate::metrics::METRICS;
 use crate::{Result, UserId};
@@ -70,7 +70,7 @@ impl StorageMapping {
     async fn get_storage_mapping(
         &self,
         storage: u32,
-    ) -> Result<Ref<'_, u32, CachedAccess, RandomState>, DatabaseError> {
+    ) -> Result<Ref<'_, u32, CachedAccess>, DatabaseError> {
         if let Some(cached) = self.cache.get(&storage).filter(|cached| cached.is_valid()) {
             Ok(cached)
         } else {

src/user.rs

@@ -2,7 +2,7 @@
  * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
- 
+
 use crate::passthru_hasher::PassthruHasher;
 use ahash::RandomState;
 use dashmap::DashMap;
@@ -11,7 +11,6 @@ use once_cell::race::OnceBox;
 use once_cell::sync::Lazy;
 use serde::de::{Error, Visitor};
 use serde::{Deserialize, Deserializer};
-use sqlx::database::HasValueRef;
 use sqlx::error::BoxDynError;
 use sqlx::{Database, Decode, Type};
 use std::fmt;
@@ -86,7 +85,7 @@ impl<'r, DB: Database> Decode<'r, DB> for UserId
 where
     &'r str: Decode<'r, DB>,
 {
-    fn decode(value: <DB as HasValueRef<'r>>::ValueRef) -> Result<Self, BoxDynError> {
+    fn decode(value: DB::ValueRef<'r>) -> Result<Self, BoxDynError> {
         <&str as Decode<DB>>::decode(value).map(UserId::new)
     }
 }

test_client/Cargo.toml

@@ -7,11 +7,11 @@ authors = ["Robin Appelman <robin@icewind.nl>"]
 edition = "2018"
 
 [dependencies]
-tungstenite = { version = "0.21.0", features = ["rustls-tls-webpki-roots"] }
-serde_json = "1.0.117"
-ureq = "2.9.7"
-flexi_logger = { version = "0.28.1", features = ["colors"] }
-log = "0.4.21"
+tungstenite = { version = "0.23.0", features = ["rustls-tls-webpki-roots", "url"] }
+serde_json = "1.0.120"
+ureq = "2.10.0"
+flexi_logger = { version = "0.28.5", features = ["colors"] }
+log = "0.4.22"
 base64 = "0.22.1"
 miette = { version = "7.2.0", features = ["fancy"] }
-url = "2.5.0"
+url = "2.5.2"

test_client/src/main.rs

@@ -2,7 +2,7 @@
  * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
- 
+
 use base64::Engine;
 use flexi_logger::{AdaptiveFormat, Logger};
 use log::{debug, info, trace, warn};