Dependencies maintainance 🧹

crates/devolutions-agent-shared/Cargo.toml

@@ -13,12 +13,12 @@ workspace = true
 camino = "1.1"
 cfg-if = "1"
 serde = { version = "1", features = ["derive"] }
-thiserror = "1"
+thiserror = "2"
 
 [target.'cfg(windows)'.dependencies]
-windows-registry = "0.3"
+windows-registry = "0.5"
 # Required for `windows-registry` error type. (`Error` is not reexported from `windows-registry`).
-windows-result = "0.2"
+windows-result = "0.3"
 uuid = "1"
 
 [dev-dependencies]

crates/devolutions-agent-shared/src/date_version.rs

@@ -1,7 +1,8 @@
 use std::fmt;
 use std::str::FromStr;
 
-use serde::{Deserialize, Serialize};
+use serde::de::Deserialize;
+use serde::ser::Serialize;
 use thiserror::Error;
 
 #[derive(Debug, Error)]

crates/devolutions-agent-shared/src/lib.rs

@@ -1,8 +1,12 @@
-mod date_version;
-mod update_json;
+#[macro_use]
+extern crate serde;
+
 #[cfg(windows)]
 pub mod windows;
 
+mod date_version;
+mod update_json;
+
 #[cfg(not(windows))]
 use std::convert::Infallible;
 use std::env;

crates/devolutions-agent-shared/src/update_json.rs

@@ -1,5 +1,4 @@
 use crate::DateVersion;
-use serde::{Deserialize, Serialize};
 use std::fmt;
 
 /// Example JSON structure:

crates/devolutions-gateway-generators/Cargo.toml

@@ -7,6 +7,6 @@ publish = false
 
 [dependencies]
 devolutions-gateway = { path = "../../devolutions-gateway" }
-proptest = "1.5"
-uuid = "1.10"
+proptest = "1.7"
+uuid = "1.17"
 serde = { version = "1", features = ["derive"] }

crates/devolutions-gateway-task/Cargo.toml

@@ -13,5 +13,5 @@ default = []
 named_tasks = ["tokio/tracing"]
 
 [dependencies]
-tokio = { version = "1.44", features = ["sync", "rt", "tracing"] }
+tokio = { version = "1.45", features = ["sync", "rt", "tracing"] }
 async-trait = "0.1"

crates/devolutions-log/Cargo.toml

@@ -23,7 +23,7 @@ camino = "1.1"
 
 # Async
 async-trait = "0.1"
-tokio = { version = "1.44", features = ["signal", "net", "io-util", "time", "rt", "rt-multi-thread", "sync", "macros", "parking_lot", "fs"] }
+tokio = { version = "1.45", features = ["signal", "net", "io-util", "time", "rt", "rt-multi-thread", "sync", "macros", "parking_lot", "fs"] }
 
 # Logging
 tracing = "0.1"

crates/devolutions-pedm-shared/Cargo.toml

@@ -13,11 +13,11 @@ serde = { version = "1.0", features = ["derive"], optional = true }
 win-api-wrappers = { path = "../win-api-wrappers", optional = true }
 hyper = { version = "~0.14", features = ["client", "http1"], optional = true } # old version required for OpenAPI generator
 serde_json = { version = "1.0", optional = true }
-tokio = { version = "1.44", features = ["net", "sync"], optional = true }
+tokio = { version = "1.45", features = ["net", "sync"], optional = true }
 glob = { version = "0.3", optional = true }
 regex = { version = "1.11", optional = true }
 schemars = { version = "0.8", features = ["uuid1"], optional = true }
-windows-registry = { version = "0.2", optional = true }
+windows-registry = { version = "0.5", optional = true }
 devolutions-pedm-client-http = { path = "./devolutions-pedm-client-http", optional = true }
 tower = { version = "0.3", optional = true } # old version required for OpenAPI generator
 pin-project = { version = "1.1", optional = true }

crates/devolutions-pedm-shared/devolutions-pedm-client-http/Cargo.toml

@@ -11,7 +11,7 @@ edition = "2021"
 serde = { version = "^1.0", features = ["derive"] }
 serde_json = "^1.0"
 url = "^2.5"
-uuid = { version = "^1.8", features = ["serde", "v4"] }
+uuid = { version = "^1.17", features = ["serde", "v4"] }
 hyper = { version = "~0.14", features = ["full"] }
 hyper-tls = "~0.5"
 http = "~0.2"

crates/devolutions-pedm-shell-ext/Cargo.toml

@@ -11,8 +11,8 @@ publish = false
 crate-type = ["cdylib"]
 
 [dependencies]
-tokio = { version = "1.44", features = ["sync"] }
-windows-core = "0.58" # necessary because of macro resolving `windows::core`. Must match `win-api-wrappers` version.
+tokio = { version = "1.45", features = ["sync"] }
+windows-core = "0.61" # necessary because of macro resolving `windows::core`. Must match `win-api-wrappers` version.
 devolutions-pedm-shared = { path = "../devolutions-pedm-shared", features = ["pedm_client", "desktop"] }
 win-api-wrappers = { path = "../win-api-wrappers" }
 parking_lot = "0.12"
@@ -22,4 +22,4 @@ devolutions-pedm-shared = { path = "../devolutions-pedm-shared", features = ["bu
 fs_extra = "1.3"
 
 [target.'cfg(windows)'.build-dependencies]
-embed-resource = "2.4"
+embed-resource = "3.0"

crates/devolutions-pedm-shell-ext/build.rs

@@ -91,8 +91,12 @@ fn main() -> Result<(), Box<dyn Error>> {
     let version_rc_data = generate_version_rc();
     fs::write(&version_rc_file, version_rc_data).unwrap();
 
-    embed_resource::compile(&version_rc_file, embed_resource::NONE);
-    embed_resource::compile("resources.rc", embed_resource::NONE);
+    embed_resource::compile(&version_rc_file, embed_resource::NONE)
+        .manifest_required()
+        .unwrap();
+    embed_resource::compile("resources.rc", embed_resource::NONE)
+        .manifest_required()
+        .unwrap();
 
     Ok(())
 }

crates/devolutions-pedm-shell-ext/src/lib_win.rs

@@ -15,11 +15,11 @@ use tokio::sync::mpsc::{self, Receiver, Sender};
 use win_api_wrappers::fs::get_system32_path;
 use win_api_wrappers::process::{Module, Process};
 use win_api_wrappers::raw::core::{
-    implement, interface, Error, IUnknown, IUnknown_Vtbl, Interface, Result, GUID, HRESULT, PWSTR,
+    implement, interface, Error, IUnknown, IUnknown_Vtbl, Interface, Result, BOOL, GUID, HRESULT, PWSTR,
 };
 use win_api_wrappers::raw::Win32::Foundation::{
-    BOOL, CLASS_E_CLASSNOTAVAILABLE, CLASS_E_NOAGGREGATION, ERROR_CANCELLED, E_FAIL, E_INVALIDARG, E_NOTIMPL,
-    E_POINTER, E_UNEXPECTED, HINSTANCE,
+    CLASS_E_CLASSNOTAVAILABLE, CLASS_E_NOAGGREGATION, ERROR_CANCELLED, E_FAIL, E_INVALIDARG, E_NOTIMPL, E_POINTER,
+    E_UNEXPECTED, HINSTANCE,
 };
 use win_api_wrappers::raw::Win32::Security::TOKEN_QUERY;
 use win_api_wrappers::raw::Win32::System::Com::{CoTaskMemFree, IBindCtx, IClassFactory, IClassFactory_Impl};
@@ -74,7 +74,7 @@ impl ElevationContextMenuCommand {
 impl IElevationContextMenuCommand_Impl for ElevationContextMenuCommand_Impl {}
 
 impl IExplorerCommand_Impl for ElevationContextMenuCommand_Impl {
-    fn GetTitle(&self, _item_array: Option<&IShellItemArray>) -> Result<PWSTR> {
+    fn GetTitle(&self, _item_array: windows_core::Ref<'_, IShellItemArray>) -> Result<PWSTR> {
         // SAFETY:
         // `DLL_MODULE` is fully initialized and valid for the lifetime of the DLL in the process,
         // and is not mutated after inital initialization
@@ -89,7 +89,7 @@ impl IExplorerCommand_Impl for ElevationContextMenuCommand_Impl {
         unsafe { SHStrDupW(title.as_pwstr()) }
     }
 
-    fn GetIcon(&self, _item_array: Option<&IShellItemArray>) -> Result<PWSTR> {
+    fn GetIcon(&self, _item_array: windows_core::Ref<'_, IShellItemArray>) -> Result<PWSTR> {
         let Ok(module) = Module::current() else {
             return Err(E_FAIL.into());
         };
@@ -109,19 +109,23 @@ impl IExplorerCommand_Impl for ElevationContextMenuCommand_Impl {
         unsafe { SHStrDupW(icon_path.as_pwstr()) }
     }
 
-    fn GetToolTip(&self, _item_array: Option<&IShellItemArray>) -> Result<PWSTR> {
+    fn GetToolTip(&self, _item_array: windows_core::Ref<'_, IShellItemArray>) -> Result<PWSTR> {
         Err(E_NOTIMPL.into())
     }
 
     fn GetCanonicalName(&self) -> Result<GUID> {
         Ok(self.guid)
     }
 
-    fn GetState(&self, _item_array: Option<&IShellItemArray>, _ok_to_be_slow: BOOL) -> Result<u32> {
+    fn GetState(&self, _item_array: windows_core::Ref<'_, IShellItemArray>, _ok_to_be_slow: BOOL) -> Result<u32> {
         Ok(ECS_ENABLED.0 as _)
     }
 
-    fn Invoke(&self, item_array: Option<&IShellItemArray>, _bind_ctx: Option<&IBindCtx>) -> Result<()> {
+    fn Invoke(
+        &self,
+        item_array: windows_core::Ref<'_, IShellItemArray>,
+        _bind_ctx: windows_core::Ref<'_, IBindCtx>,
+    ) -> Result<()> {
         // SAFETY: `item_array` is valid and `GetCount` has no preconditions.
         if item_array.is_none() || unsafe { item_array.unwrap().GetCount() }? < 1 {
             return Ok(());
@@ -167,9 +171,9 @@ impl IExplorerCommand_Impl for ElevationContextMenuCommand_Impl {
 }
 
 impl IObjectWithSite_Impl for ElevationContextMenuCommand_Impl {
-    fn SetSite(&self, site: Option<&IUnknown>) -> Result<()> {
-        if let Some(site) = site {
-            self.site.write().replace(site.clone());
+    fn SetSite(&self, site: windows_core::Ref<'_, windows_core::IUnknown>) -> Result<()> {
+        if let Some(site) = site.cloned() {
+            self.site.write().replace(site);
             Ok(())
         } else {
             Err(E_FAIL.into())
@@ -365,7 +369,12 @@ extern "system" fn DllMain(dll_module: HINSTANCE, call_reason: u32, _: *mut ())
 struct ElevationContextMenuCommandFactory;
 
 impl IClassFactory_Impl for ElevationContextMenuCommandFactory_Impl {
-    fn CreateInstance(&self, outer: Option<&IUnknown>, iid: *const GUID, object: *mut *mut c_void) -> Result<()> {
+    fn CreateInstance(
+        &self,
+        outer: windows_core::Ref<'_, windows_core::IUnknown>,
+        iid: *const GUID,
+        object: *mut *mut c_void,
+    ) -> Result<()> {
         if object.is_null() {
             return Err(E_INVALIDARG.into());
         }

crates/devolutions-pedm/Cargo.toml

@@ -16,14 +16,14 @@ base16ct = { version = "0.2", features = ["std", "alloc"] }
 base64 = "0.22"
 chrono = { version = "0.4", features = ["serde"] }
 digest = "0.10"
-hyper = { version = "1.3", features = ["server"] }
+hyper = { version = "1.6", features = ["server"] }
 hyper-util = { version = "0.1", features = ["tokio"] }
 schemars = { version = "0.8", features = ["chrono"] }
 serde = "1.0"
 serde_json = "1.0"
 sha1 = "0.10"
 sha2 = "0.10"
-tokio = { version = "1.44", features = ["net", "rt-multi-thread"] }
+tokio = { version = "1.45", features = ["net", "rt-multi-thread"] }
 tower-service = "0.3"
 win-api-wrappers = { path = "../win-api-wrappers" }
 devolutions-pedm-shared = { path = "../devolutions-pedm-shared", features = ["policy"]}

crates/devolutions-pedm/src/api/mod.rs

@@ -119,8 +119,8 @@ fn create_pipe(pipe_name: &str) -> anyhow::Result<NamedPipeServer> {
             HANDLE(pipe.as_raw_handle().cast()),
             SE_KERNEL_OBJECT,
             DACL_SECURITY_INFORMATION,
-            PSID::default(),
-            PSID::default(),
+            None,
+            None,
             Some(dacl.as_ptr().cast()),
             None,
         )

crates/jet-proto/Cargo.toml

@@ -11,9 +11,9 @@ workspace = true
 [dependencies]
 log = "0.4"
 byteorder = "1.5"
-uuid = { version = "1.10", features = ["v4"] }
-httparse = "1.9"
-http = "1.1"
+uuid = { version = "1.17", features = ["v4"] }
+httparse = "1.10"
+http = "1.3"
 
 [dev-dependencies]
-hex-literal = "0.4"
+hex-literal = "1.0"

crates/jmux-generators/Cargo.toml

@@ -7,4 +7,4 @@ publish = false
 
 [dependencies]
 jmux-proto = { path = "../jmux-proto" }
-proptest = "1.5"
+proptest = "1.7"

crates/jmux-proto/Cargo.toml

@@ -9,9 +9,9 @@ publish = false
 workspace = true
 
 [dependencies]
-bytes = "1.6"
-smol_str = "0.2"
+bytes = "1.10"
+smol_str = "0.3"
 
 [dev-dependencies]
-proptest = "1.5"
+proptest = "1.7"
 jmux-generators = { path = "../jmux-generators" }

crates/jmux-proxy/Cargo.toml

@@ -15,7 +15,7 @@ workspace = true
 jmux-proto = { path = "../jmux-proto" }
 
 # async
-tokio = { version = "1.44", features = ["net", "rt", "io-util", "macros"] }
+tokio = { version = "1.45", features = ["net", "rt", "io-util", "macros"] }
 tokio-util = { version = "0.7", features = ["codec"] }
 futures-util = { version = "0.3", features = ["sink"] }
 
@@ -26,5 +26,5 @@ anyhow = "1.0"
 tracing = "0.1"
 
 # codec implementation
-bytes = "1.6"
+bytes = "1.10"
 bitvec = "1.0"

crates/job-queue-libsql/Cargo.toml

@@ -16,6 +16,6 @@ libsql = { version = "0.9", default-features = false, features = ["core", "serde
 serde = "1"
 time = { version = "0.3", default-features = false, features = ["std"] }
 tracing = "0.1"
-typed-builder = "0.19"
-ulid = { version = "1.1", features = ["uuid"] }
-uuid = "1.11"
+typed-builder = "0.21"
+ulid = { version = "1.2", features = ["uuid"] }
+uuid = "1.17"

crates/job-queue/Cargo.toml

@@ -13,4 +13,4 @@ anyhow = "1"
 async-trait = "0.1"
 time = { version = "0.3", default-features = false }
 tracing = "0.1"
-uuid = "1.11"
+uuid = "1.17"

crates/mock-net/Cargo.toml

@@ -6,8 +6,8 @@ authors = ["Devolutions Inc. <infos@devolutions.net>"]
 publish = false
 
 [dependencies]
-tokio = { version = "1.44", features = ["io-util", "sync"] }
+tokio = { version = "1.45", features = ["io-util", "sync"] }
 loom = { version = "0.7", features = ["futures", "checkpoint"] }
 
 [dev-dependencies]
-tokio = { version = "1.44", features = ["rt"] }
+tokio = { version = "1.45", features = ["rt"] }

crates/network-scanner-net/Cargo.toml

@@ -12,15 +12,15 @@ workspace = true
 anyhow = "1"
 crossbeam = { version = "0.8", features = ["crossbeam-channel"] }
 parking_lot = "0.12"
-polling = "3.7"
+polling = "3.8"
 socket2 = { version = "0.5", features = ["all"] }
-thiserror = "1"
+thiserror = "2"
 tracing = "0.1"
 
 [dev-dependencies]
 tracing-cov-mark = { path = "../tracing-cov-mark" }
 tracing-subscriber = "0.3"
-tokio = { version = "1.44", features = [
+tokio = { version = "1.45", features = [
     "rt",
     "sync",
     "macros",

crates/network-scanner/Cargo.toml

@@ -18,10 +18,10 @@ network-scanner-net = { path = "../network-scanner-net" }
 network-scanner-proto = { path = "../network-scanner-proto" }
 parking_lot = "0.12"
 socket2 = "0.5"
-thiserror = "1"
-tokio = { version = "1.44", features = ["rt", "sync", "time", "fs"] }
+thiserror = "2"
+tokio = { version = "1.45", features = ["rt", "sync", "time", "fs"] }
 tracing = "0.1"
-typed-builder = "0.19"
+typed-builder = "0.21"
 
 [target.'cfg(target_os = "windows")'.dependencies]
 ipconfig = "0.3"
@@ -32,5 +32,5 @@ netlink-packet-route = "0.19"
 rtnetlink = "0.14"
 
 [dev-dependencies]
-tokio = { version = "1.44", features = ["rt", "macros", "rt-multi-thread", "tracing", "signal"] }
+tokio = { version = "1.45", features = ["rt", "macros", "rt-multi-thread", "tracing", "signal"] }
 tracing-subscriber = "0.3"

crates/proxy-generators/Cargo.toml

@@ -7,4 +7,4 @@ publish = false
 
 [dependencies]
 proxy-types = { path = "../proxy-types" }
-proptest = "1.5"
+proptest = "1.7"

crates/proxy-http/Cargo.toml

@@ -11,10 +11,10 @@ workspace = true
 
 [dependencies]
 proxy-types = { path = "../proxy-types" }
-tokio = { version = "1.44", features = ["io-util"] }
+tokio = { version = "1.45", features = ["io-util"] }
 pin-project-lite = "0.2"
-bytes = "1.6"
+bytes = "1.10"
 
 [dev-dependencies]
-proptest = "1.5"
+proptest = "1.7"
 proxy-generators = { path = "../proxy-generators" }

crates/proxy-server/Cargo.toml

@@ -12,4 +12,4 @@ workspace = true
 proxy-socks = { path = "../proxy-socks" }
 proxy-http = { path = "../proxy-http" }
 proxy-types = { path = "../proxy-types" }
-tokio = { version = "1.44", features = ["rt", "net", "rt-multi-thread", "macros"] }
+tokio = { version = "1.45", features = ["rt", "net", "rt-multi-thread", "macros"] }

crates/proxy-socks/Cargo.toml

@@ -11,10 +11,10 @@ workspace = true
 
 [dependencies]
 proxy-types = { path = "../proxy-types" }
-tokio = { version = "1.44", features = ["io-util"] }
+tokio = { version = "1.45", features = ["io-util"] }
 
 [dev-dependencies]
-tokio = { version = "1.44", features = ["rt", "macros"] }
+tokio = { version = "1.45", features = ["rt", "macros"] }
 tokio-test = "0.4"
-proptest = "1.5"
+proptest = "1.7"
 proxy-generators = { path = "../proxy-generators" }