diff --git a/Cargo.lock b/Cargo.lock index 249179819..79c36ea4b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -90,7 +90,7 @@ checksum = "a2477554ebf38aea815a9c4729100cfc32f766876c45b9c9c38ef221b9d1a703" dependencies = [ "axum 0.8.4", "axum-extra", - "bytes 1.10.1", + "bytes", "cfg-if", "http 1.3.1", "indexmap 2.10.0", @@ -208,7 +208,7 @@ dependencies = [ "log", "pin-utils", "pkg-config", - "tokio 1.46.1", + "tokio", "winapi", ] @@ -242,7 +242,7 @@ checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476" dependencies = [ "async-stream-impl", "futures-core", - "pin-project-lite 0.2.16", + "pin-project-lite", ] [[package]] @@ -324,7 +324,7 @@ dependencies = [ "async-trait", "axum-core 0.3.4", "bitflags 1.3.2", - "bytes 1.10.1", + "bytes", "futures-util", "http 0.2.12", "http-body 0.4.6", @@ -334,7 +334,7 @@ dependencies = [ "memchr", "mime", "percent-encoding", - "pin-project-lite 0.2.16", + "pin-project-lite", "rustversion", "serde", "sync_wrapper 0.1.2", @@ -351,7 +351,7 @@ checksum = "021e862c184ae977658b36c4500f7feac3221ca5da43e3f25bd04ab6c79a29b5" dependencies = [ "axum-core 0.5.2", "base64 0.22.1", - "bytes 1.10.1", + "bytes", "form_urlencoded", "futures-util", "http 1.3.1", @@ -364,7 +364,7 @@ dependencies = [ "memchr", "mime", "percent-encoding", - "pin-project-lite 0.2.16", + "pin-project-lite", "rustversion", "serde", "serde_json", @@ -372,8 +372,8 @@ dependencies = [ "serde_urlencoded", "sha1", "sync_wrapper 1.0.2", - "tokio 1.46.1", - "tokio-tungstenite", + "tokio", + "tokio-tungstenite 0.26.2", "tower 0.5.2", "tower-layer", "tower-service", @@ -387,7 +387,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" dependencies = [ "async-trait", - "bytes 1.10.1", + "bytes", "futures-util", "http 0.2.12", "http-body 0.4.6", @@ -403,13 +403,13 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68464cd0412f486726fb3373129ef5d2993f90c34bc2bc1c1e9943b2f4fc7ca6" dependencies = [ - "bytes 1.10.1", + "bytes", "futures-core", "http 1.3.1", "http-body 1.0.1", "http-body-util", "mime", - "pin-project-lite 0.2.16", + "pin-project-lite", "rustversion", "sync_wrapper 1.0.2", "tower-layer", @@ -425,7 +425,7 @@ checksum = "45bf463831f5131b7d3c756525b305d40f1185b688565648a92e1392ca35713d" dependencies = [ "axum 0.8.4", "axum-core 0.5.2", - "bytes 1.10.1", + "bytes", "form_urlencoded", "futures-util", "headers", @@ -433,12 +433,12 @@ dependencies = [ "http-body 1.0.1", "http-body-util", "mime", - "pin-project-lite 0.2.16", + "pin-project-lite", "rustversion", "serde", "serde_html_form", "serde_path_to_error", - "tokio 1.46.1", + "tokio", "tokio-util", "tower 0.5.2", "tower-layer", @@ -525,7 +525,7 @@ checksum = "212d8b8e1a22743d9241575c6ba822cf9c8fef34771c86ab7e477a4fbfd254e5" dependencies = [ "futures-util", "parking_lot", - "tokio 1.46.1", + "tokio", ] [[package]] @@ -535,7 +535,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e570e6557cd0f88d28d32afa76644873271a70dc22656df565b2021c4036aa9c" dependencies = [ "bb8", - "tokio 1.46.1", + "tokio", "tokio-postgres", ] @@ -696,12 +696,6 @@ dependencies = [ "byteorder", ] -[[package]] -name = "bytes" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" - [[package]] name = "bytes" version = "1.10.1" @@ -1158,7 +1152,7 @@ dependencies = [ "sha2", "tap", "thiserror 2.0.12", - "tokio 1.46.1", + "tokio", "tokio-rustls", "tracing", "uuid", @@ -1191,7 +1185,7 @@ dependencies = [ "axum-extra", "backoff", "bitflags 2.9.1", - "bytes 1.10.1", + "bytes", "cadeau", "camino", "ceviche", @@ -1227,7 +1221,7 @@ dependencies = [ "pcap-file", "picky", "picky-krb 0.11.0", - "pin-project-lite 0.2.16", + "pin-project-lite", "portpicker", "proptest", "reqwest", @@ -1243,17 +1237,17 @@ dependencies = [ "terminal-streamer", "thiserror 2.0.12", "time", - "tokio 1.46.1", + "tokio", "tokio-rustls", "tokio-test", - "tokio-tungstenite", + "tokio-tungstenite 0.27.0", "tower 0.5.2", - "tower-http 0.5.2", + "tower-http 0.6.6", "tracing", "tracing-cov-mark", "tracing-subscriber", "transport", - "tungstenite", + "tungstenite 0.26.2", "typed-builder", "url", "utoipa", @@ -1278,7 +1272,7 @@ name = "devolutions-gateway-task" version = "0.0.0" dependencies = [ "async-trait", - "tokio 1.46.1", + "tokio", ] [[package]] @@ -1289,7 +1283,7 @@ dependencies = [ "async-trait", "camino", "devolutions-gateway-task", - "tokio 1.46.1", + "tokio", "tracing", "tracing-appender", "tracing-subscriber", @@ -1325,10 +1319,10 @@ dependencies = [ "serde_json", "sha1", "sha2", - "tokio 1.46.1", + "tokio", "tokio-postgres", "tower 0.5.2", - "tower-http 0.5.2", + "tower-http 0.6.6", "tower-service", "tracing", "uuid", @@ -1370,14 +1364,14 @@ dependencies = [ "devolutions-pedm-client-http", "dunce", "glob", - "hyper 0.14.32", - "pin-project 1.1.10", + "hyper 1.6.0", + "pin-project", "regex", "schemars", "serde", "serde_json", - "tokio 1.46.1", - "tower 0.3.1", + "tokio", + "tower 0.5.2", "uuid", "win-api-wrappers", "windows-registry", @@ -1391,7 +1385,7 @@ dependencies = [ "embed-resource", "fs_extra", "parking_lot", - "tokio 1.46.1", + "tokio", "win-api-wrappers", "windows-core 0.61.2", ] @@ -1416,7 +1410,7 @@ dependencies = [ "tap", "tempfile", "thiserror 2.0.12", - "tokio 1.46.1", + "tokio", "tracing", "win-api-wrappers", "windows 0.61.3", @@ -1854,7 +1848,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.16", + "pin-project-lite", "pin-utils", "slab", ] @@ -1969,7 +1963,7 @@ version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ - "bytes 1.10.1", + "bytes", "fnv", "futures-core", "futures-sink", @@ -1977,7 +1971,7 @@ dependencies = [ "http 0.2.12", "indexmap 2.10.0", "slab", - "tokio 1.46.1", + "tokio", "tokio-util", "tracing", ] @@ -1989,14 +1983,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17da50a276f1e01e0ba6c029e47b7100754904ee8a278f886546e98575380785" dependencies = [ "atomic-waker", - "bytes 1.10.1", + "bytes", "fnv", "futures-core", "futures-sink", "http 1.3.1", "indexmap 2.10.0", "slab", - "tokio 1.46.1", + "tokio", "tokio-util", "tracing", ] @@ -2039,7 +2033,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3314d5adb5d94bcdf56771f2e50dbbc80bb4bdf88967526706205ac9eff24eb" dependencies = [ "base64 0.22.1", - "bytes 1.10.1", + "bytes", "headers-core", "http 1.3.1", "httpdate", @@ -2129,7 +2123,7 @@ version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ - "bytes 1.10.1", + "bytes", "fnv", "itoa", ] @@ -2140,7 +2134,7 @@ version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565" dependencies = [ - "bytes 1.10.1", + "bytes", "fnv", "itoa", ] @@ -2151,9 +2145,9 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ - "bytes 1.10.1", + "bytes", "http 0.2.12", - "pin-project-lite 0.2.16", + "pin-project-lite", ] [[package]] @@ -2162,7 +2156,7 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ - "bytes 1.10.1", + "bytes", "http 1.3.1", ] @@ -2172,11 +2166,11 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" dependencies = [ - "bytes 1.10.1", + "bytes", "futures-core", "http 1.3.1", "http-body 1.0.1", - "pin-project-lite 0.2.16", + "pin-project-lite", ] [[package]] @@ -2215,7 +2209,7 @@ version = "0.14.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7" dependencies = [ - "bytes 1.10.1", + "bytes", "futures-channel", "futures-core", "futures-util", @@ -2225,9 +2219,9 @@ dependencies = [ "httparse", "httpdate", "itoa", - "pin-project-lite 0.2.16", + "pin-project-lite", "socket2", - "tokio 1.46.1", + "tokio", "tower-service", "tracing", "want", @@ -2239,7 +2233,7 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80" dependencies = [ - "bytes 1.10.1", + "bytes", "futures-channel", "futures-util", "h2 0.4.11", @@ -2248,9 +2242,9 @@ dependencies = [ "httparse", "httpdate", "itoa", - "pin-project-lite 0.2.16", + "pin-project-lite", "smallvec", - "tokio 1.46.1", + "tokio", "want", ] @@ -2263,10 +2257,10 @@ dependencies = [ "http 1.3.1", "hyper 1.6.0", "hyper-util", - "rustls 0.23.28", + "rustls 0.23.29", "rustls-native-certs", "rustls-pki-types", - "tokio 1.46.1", + "tokio", "tokio-rustls", "tower-service", ] @@ -2278,8 +2272,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ "hyper 0.14.32", - "pin-project-lite 0.2.16", - "tokio 1.46.1", + "pin-project-lite", + "tokio", "tokio-io-timeout", ] @@ -2289,10 +2283,10 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ - "bytes 1.10.1", + "bytes", "hyper 0.14.32", "native-tls", - "tokio 1.46.1", + "tokio", "tokio-native-tls", ] @@ -2303,7 +2297,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f66d5bd4c6f02bf0542fad85d626775bab9258cf795a4256dcaf3161114d1df" dependencies = [ "base64 0.22.1", - "bytes 1.10.1", + "bytes", "futures-channel", "futures-core", "futures-util", @@ -2313,10 +2307,10 @@ dependencies = [ "ipnet", "libc", "percent-encoding", - "pin-project-lite 0.2.16", + "pin-project-lite", "socket2", "system-configuration", - "tokio 1.46.1", + "tokio", "tower-service", "tracing", "windows-registry", @@ -2614,7 +2608,7 @@ name = "ironrdp-async" version = "0.1.0" source = "git+https://github.com/Devolutions/IronRDP?rev=2e1a9ac88e38e7d92d893007bc25d0a05c365861#2e1a9ac88e38e7d92d893007bc25d0a05c365861" dependencies = [ - "bytes 1.10.1", + "bytes", "ironrdp-connector 0.1.0", "ironrdp-pdu 0.1.0", "tracing", @@ -2626,7 +2620,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bb8b3d345988b6791fd780befc08df35c81a030603e4588c6fb9bf4b14dd3ab" dependencies = [ - "bytes 1.10.1", + "bytes", "ironrdp-connector 0.5.1", "ironrdp-core", "ironrdp-pdu 0.5.0", @@ -2821,7 +2815,7 @@ dependencies = [ "ironrdp-rdpsnd", "ironrdp-svc 0.1.0", "ironrdp-tokio 0.1.0", - "tokio 1.46.1", + "tokio", "tokio-rustls", "tracing", ] @@ -2851,9 +2845,9 @@ name = "ironrdp-tokio" version = "0.1.0" source = "git+https://github.com/Devolutions/IronRDP?rev=2e1a9ac88e38e7d92d893007bc25d0a05c365861#2e1a9ac88e38e7d92d893007bc25d0a05c365861" dependencies = [ - "bytes 1.10.1", + "bytes", "ironrdp-async 0.1.0", - "tokio 1.46.1", + "tokio", ] [[package]] @@ -2862,9 +2856,9 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95af93439e7322763477bafd4b153ab64fe29b138f87fe80c188fcfa04634584" dependencies = [ - "bytes 1.10.1", + "bytes", "ironrdp-async 0.5.0", - "tokio 1.46.1", + "tokio", ] [[package]] @@ -2914,15 +2908,15 @@ dependencies = [ "proxy-socks", "proxy-types", "proxy_cfg", - "rustls 0.23.28", + "rustls 0.23.29", "rustls-native-certs", "rustls-pemfile 2.2.0", "seahorse", "sysinfo", "test-utils", "tinyjson", - "tokio 1.46.1", - "tokio-tungstenite", + "tokio", + "tokio-tungstenite 0.27.0", "tracing", "tracing-appender", "tracing-subscriber", @@ -2943,7 +2937,7 @@ dependencies = [ name = "jmux-proto" version = "0.0.0" dependencies = [ - "bytes 1.10.1", + "bytes", "jmux-generators", "proptest", "smol_str", @@ -2955,10 +2949,10 @@ version = "0.0.0" dependencies = [ "anyhow", "bitvec", - "bytes 1.10.1", + "bytes", "futures-util", "jmux-proto", - "tokio 1.46.1", + "tokio", "tokio-util", "tracing", ] @@ -3171,7 +3165,7 @@ dependencies = [ "base64 0.21.7", "bincode", "bitflags 2.9.1", - "bytes 1.10.1", + "bytes", "chrono", "crc32fast", "fallible-iterator 0.3.0", @@ -3186,7 +3180,7 @@ dependencies = [ "serde", "serde_json", "thiserror 1.0.69", - "tokio 1.46.1", + "tokio", "tokio-stream", "tokio-util", "tonic", @@ -3217,7 +3211,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09754f239a048aff667f0f2f492a4011d2bdafa8e662c138ab2c86badf73aaf5" dependencies = [ "base64 0.21.7", - "bytes 1.10.1", + "bytes", "prost", "serde", ] @@ -3260,7 +3254,7 @@ version = "0.9.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62d1e07a691696cb18c2faba98313a194f0804aa6a1ce8aa9919b7ecd290d458" dependencies = [ - "bytes 1.10.1", + "bytes", "libsql-ffi", "libsql-rusqlite", "once_cell", @@ -3277,7 +3271,7 @@ dependencies = [ "aes", "async-stream", "async-trait", - "bytes 1.10.1", + "bytes", "cbc", "libsql-rusqlite", "libsql-sys", @@ -3285,7 +3279,7 @@ dependencies = [ "prost", "serde", "thiserror 1.0.69", - "tokio 1.46.1", + "tokio", "tokio-stream", "tokio-util", "tonic", @@ -3492,7 +3486,7 @@ name = "mock-net" version = "0.0.0" dependencies = [ "loom", - "tokio 1.46.1", + "tokio", ] [[package]] @@ -3515,12 +3509,12 @@ dependencies = [ "async-trait", "awaitdrop", "bitflags 1.3.2", - "bytes 1.10.1", + "bytes", "futures", - "pin-project 1.1.10", + "pin-project", "rand 0.8.5", "thiserror 1.0.69", - "tokio 1.46.1", + "tokio", "tokio-util", "tracing", ] @@ -3585,7 +3579,7 @@ version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72452e012c2f8d612410d89eea01e2d9b56205274abb35d53f60200b2ec41d60" dependencies = [ - "bytes 1.10.1", + "bytes", "futures", "log", "netlink-packet-core", @@ -3599,11 +3593,11 @@ version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16c903aa70590cb93691bf97a767c8d1d6122d2cc9070433deb3bbf36ce8bd23" dependencies = [ - "bytes 1.10.1", + "bytes", "futures", "libc", "log", - "tokio 1.46.1", + "tokio", ] [[package]] @@ -3636,7 +3630,7 @@ dependencies = [ "rtnetlink", "socket2", "thiserror 2.0.12", - "tokio 1.46.1", + "tokio", "tracing", "tracing-subscriber", "typed-builder", @@ -3652,7 +3646,7 @@ dependencies = [ "polling 3.8.0", "socket2", "thiserror 2.0.12", - "tokio 1.46.1", + "tokio", "tracing", "tracing-cov-mark", "tracing-subscriber", @@ -3676,7 +3670,7 @@ dependencies = [ "async-trait", "awaitdrop", "base64 0.13.1", - "bytes 1.10.1", + "bytes", "futures", "hostname 0.3.1", "muxado", @@ -3687,7 +3681,7 @@ dependencies = [ "serde", "serde_json", "thiserror 1.0.69", - "tokio 1.46.1", + "tokio", "tokio-retry", "tokio-util", "tracing", @@ -4328,33 +4322,13 @@ dependencies = [ "uuid", ] -[[package]] -name = "pin-project" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ef0f924a5ee7ea9cbcea77529dba45f8a9ba9f622419fe3386ca581a3ae9d5a" -dependencies = [ - "pin-project-internal 0.4.30", -] - [[package]] name = "pin-project" version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a" dependencies = [ - "pin-project-internal 1.1.10", -] - -[[package]] -name = "pin-project-internal" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "851c8d0ce9bebe43790dedfc86614c23494ac9f423dd618d3a61fc693eafe61e" -dependencies = [ - "proc-macro2 1.0.95", - "quote 1.0.40", - "syn 1.0.109", + "pin-project-internal", ] [[package]] @@ -4368,12 +4342,6 @@ dependencies = [ "syn 2.0.104", ] -[[package]] -name = "pin-project-lite" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" - [[package]] name = "pin-project-lite" version = "0.2.16" @@ -4425,7 +4393,7 @@ dependencies = [ "concurrent-queue", "libc", "log", - "pin-project-lite 0.2.16", + "pin-project-lite", "windows-sys 0.48.0", ] @@ -4438,7 +4406,7 @@ dependencies = [ "cfg-if", "concurrent-queue", "hermit-abi", - "pin-project-lite 0.2.16", + "pin-project-lite", "rustix 1.0.7", "tracing", "windows-sys 0.59.0", @@ -4473,7 +4441,7 @@ checksum = "76ff0abab4a9b844b93ef7b81f1efc0a366062aaef2cd702c76256b5dc075c54" dependencies = [ "base64 0.22.1", "byteorder", - "bytes 1.10.1", + "bytes", "fallible-iterator 0.2.0", "hmac", "md-5", @@ -4489,7 +4457,7 @@ version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613283563cd90e1dfc3518d548caee47e0e725455ed619881f5cf21f36de4b48" dependencies = [ - "bytes 1.10.1", + "bytes", "chrono", "fallible-iterator 0.2.0", "postgres-protocol", @@ -4615,7 +4583,7 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ - "bytes 1.10.1", + "bytes", "prost-derive", ] @@ -4644,12 +4612,12 @@ dependencies = [ name = "proxy-http" version = "0.0.0" dependencies = [ - "bytes 1.10.1", - "pin-project-lite 0.2.16", + "bytes", + "pin-project-lite", "proptest", "proxy-generators", "proxy-types", - "tokio 1.46.1", + "tokio", ] [[package]] @@ -4659,7 +4627,7 @@ dependencies = [ "proxy-http", "proxy-socks", "proxy-types", - "tokio 1.46.1", + "tokio", ] [[package]] @@ -4669,7 +4637,7 @@ dependencies = [ "proptest", "proxy-generators", "proxy-types", - "tokio 1.46.1", + "tokio", "tokio-test", ] @@ -4679,7 +4647,7 @@ version = "0.0.0" dependencies = [ "proxy-http", "proxy-socks", - "tokio 1.46.1", + "tokio", ] [[package]] @@ -4711,16 +4679,16 @@ version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "626214629cda6781b6dc1d316ba307189c85ba657213ce642d9c77670f8202c8" dependencies = [ - "bytes 1.10.1", + "bytes", "cfg_aliases", - "pin-project-lite 0.2.16", + "pin-project-lite", "quinn-proto", "quinn-udp", "rustc-hash 2.1.1", - "rustls 0.23.28", + "rustls 0.23.29", "socket2", "thiserror 2.0.12", - "tokio 1.46.1", + "tokio", "tracing", "web-time", ] @@ -4731,13 +4699,13 @@ version = "0.11.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49df843a9161c85bb8aae55f101bc0bac8bcafd637a620d9122fd7e0b2f7422e" dependencies = [ - "bytes 1.10.1", + "bytes", "getrandom 0.3.3", "lru-slab", "rand 0.9.1", "ring 0.17.14", "rustc-hash 2.1.1", - "rustls 0.23.28", + "rustls 0.23.29", "rustls-pki-types", "slab", "thiserror 2.0.12", @@ -4956,7 +4924,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cbc931937e6ca3a06e3b6c0aa7841849b160a90351d6ab467a8b9b9959767531" dependencies = [ "base64 0.22.1", - "bytes 1.10.1", + "bytes", "futures-core", "futures-util", "h2 0.4.11", @@ -4969,16 +4937,16 @@ dependencies = [ "js-sys", "log", "percent-encoding", - "pin-project-lite 0.2.16", + "pin-project-lite", "quinn", - "rustls 0.23.28", + "rustls 0.23.29", "rustls-native-certs", "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", "sync_wrapper 1.0.2", - "tokio 1.46.1", + "tokio", "tokio-rustls", "tokio-util", "tower 0.5.2", @@ -5112,7 +5080,7 @@ dependencies = [ "netlink-sys", "nix 0.27.1", "thiserror 1.0.69", - "tokio 1.46.1", + "tokio", ] [[package]] @@ -5191,9 +5159,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.28" +version = "0.23.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7160e3e10bf4535308537f3c4e1641468cd0e485175d6163087c0393c7d46643" +checksum = "2491382039b29b9b11ff08b76ff6c97cf287671dbb74f0be44bda389fffe9bd1" dependencies = [ "aws-lc-rs", "log", @@ -5207,12 +5175,11 @@ dependencies = [ [[package]] name = "rustls-cng" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c742cb7d8e43daae2dd9ca4b1da442b4500a461ce1c84249e6ac99b4bc12562e" +checksum = "ae77a1973becea1dce2a2187b69a66252a7c1a2345c191bc3501e9497f03d7ea" dependencies = [ - "rustls 0.23.28", - "sha2", + "rustls 0.23.29", "windows-sys 0.59.0", ] @@ -5258,9 +5225,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.103.3" +version = "0.103.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a72fe2bcf7a6ac6fd7d0b9e5cb68aeb7d4c0a0271730218b3e92d43b4eb435" +checksum = "0a17884ae0c1b773f1ccd2bd4a8c72f16da897310a98b0e84bf349ad5ead92fc" dependencies = [ "aws-lc-rs", "ring 0.17.14", @@ -5735,7 +5702,7 @@ dependencies = [ "sha1", "sha2", "time", - "tokio 1.46.1", + "tokio", "tracing", "url", "uuid", @@ -5774,13 +5741,13 @@ dependencies = [ "picky-krb 0.11.0", "rand 0.8.5", "rsa", - "rustls 0.23.28", + "rustls 0.23.29", "serde", "serde_derive", "sha1", "sha2", "time", - "tokio 1.46.1", + "tokio", "tracing", "url", "uuid", @@ -5947,7 +5914,7 @@ name = "terminal-streamer" version = "0.1.0" dependencies = [ "anyhow", - "tokio 1.46.1", + "tokio", "tracing", ] @@ -5959,8 +5926,8 @@ dependencies = [ "futures-util", "portpicker", "proptest", - "tokio 1.46.1", - "tokio-tungstenite", + "tokio", + "tokio-tungstenite 0.27.0", "transport", ] @@ -6107,18 +6074,6 @@ dependencies = [ "syn 2.0.104", ] -[[package]] -name = "tokio" -version = "0.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092" -dependencies = [ - "bytes 0.5.6", - "fnv", - "pin-project-lite 0.1.12", - "slab", -] - [[package]] name = "tokio" version = "1.46.1" @@ -6126,12 +6081,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0cc3a2344dafbe23a245241fe8b09735b521110d30fcefbbd5feb1797ca35d17" dependencies = [ "backtrace", - "bytes 1.10.1", + "bytes", "io-uring", "libc", "mio", "parking_lot", - "pin-project-lite 0.2.16", + "pin-project-lite", "signal-hook-registry", "slab", "socket2", @@ -6146,8 +6101,8 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" dependencies = [ - "pin-project-lite 0.2.16", - "tokio 1.46.1", + "pin-project-lite", + "tokio", ] [[package]] @@ -6168,7 +6123,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" dependencies = [ "native-tls", - "tokio 1.46.1", + "tokio", ] [[package]] @@ -6179,7 +6134,7 @@ checksum = "6c95d533c83082bb6490e0189acaa0bbeef9084e60471b696ca6988cd0541fb0" dependencies = [ "async-trait", "byteorder", - "bytes 1.10.1", + "bytes", "fallible-iterator 0.2.0", "futures-channel", "futures-util", @@ -6187,12 +6142,12 @@ dependencies = [ "parking_lot", "percent-encoding", "phf", - "pin-project-lite 0.2.16", + "pin-project-lite", "postgres-protocol", "postgres-types", "rand 0.9.1", "socket2", - "tokio 1.46.1", + "tokio", "tokio-util", "whoami", ] @@ -6203,9 +6158,9 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f" dependencies = [ - "pin-project 1.1.10", + "pin-project", "rand 0.8.5", - "tokio 1.46.1", + "tokio", ] [[package]] @@ -6214,8 +6169,8 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b" dependencies = [ - "rustls 0.23.28", - "tokio 1.46.1", + "rustls 0.23.29", + "tokio", ] [[package]] @@ -6225,8 +6180,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" dependencies = [ "futures-core", - "pin-project-lite 0.2.16", - "tokio 1.46.1", + "pin-project-lite", + "tokio", ] [[package]] @@ -6236,9 +6191,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2468baabc3311435b55dd935f702f42cd1b8abb7e754fb7dfb16bd36aa88f9f7" dependencies = [ "async-stream", - "bytes 1.10.1", + "bytes", "futures-core", - "tokio 1.46.1", + "tokio", "tokio-stream", ] @@ -6247,17 +6202,29 @@ name = "tokio-tungstenite" version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a9daff607c6d2bf6c16fd681ccb7eecc83e4e2cdc1ca067ffaadfca5de7f084" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite 0.26.2", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "489a59b6730eda1b0171fcfda8b121f4bee2b35cba8645ca35c5f7ba3eb736c1" dependencies = [ "futures-util", "log", "native-tls", - "rustls 0.23.28", + "rustls 0.23.29", "rustls-native-certs", "rustls-pki-types", - "tokio 1.46.1", + "tokio", "tokio-native-tls", "tokio-rustls", - "tungstenite", + "tungstenite 0.27.0", ] [[package]] @@ -6266,12 +6233,12 @@ version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df" dependencies = [ - "bytes 1.10.1", + "bytes", "futures-core", "futures-io", "futures-sink", - "pin-project-lite 0.2.16", - "tokio 1.46.1", + "pin-project-lite", + "tokio", ] [[package]] @@ -6340,16 +6307,16 @@ dependencies = [ "async-trait", "axum 0.6.20", "base64 0.21.7", - "bytes 1.10.1", + "bytes", "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "hyper 0.14.32", "hyper-timeout", "percent-encoding", - "pin-project 1.1.10", + "pin-project", "prost", - "tokio 1.46.1", + "tokio", "tokio-stream", "tower 0.4.13", "tower-layer", @@ -6364,11 +6331,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc3b0e1cedbf19fdfb78ef3d672cb9928e0a91a9cb4629cc0c916e8cff8aaaa1" dependencies = [ "base64 0.21.7", - "bytes 1.10.1", + "bytes", "http 0.2.12", "http-body 0.4.6", "hyper 0.14.32", - "pin-project 1.1.10", + "pin-project", "tokio-stream", "tonic", "tower-http 0.4.4", @@ -6377,24 +6344,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "tower" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3169017c090b7a28fce80abaad0ab4f5566423677c9331bb320af7e49cfe62" -dependencies = [ - "futures-core", - "tower-buffer", - "tower-discover", - "tower-layer", - "tower-limit", - "tower-load-shed", - "tower-retry", - "tower-service", - "tower-timeout", - "tower-util", -] - [[package]] name = "tower" version = "0.4.13" @@ -6404,11 +6353,11 @@ dependencies = [ "futures-core", "futures-util", "indexmap 1.9.3", - "pin-project 1.1.10", - "pin-project-lite 0.2.16", + "pin-project", + "pin-project-lite", "rand 0.8.5", "slab", - "tokio 1.46.1", + "tokio", "tokio-util", "tower-layer", "tower-service", @@ -6423,39 +6372,14 @@ checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" dependencies = [ "futures-core", "futures-util", - "pin-project-lite 0.2.16", + "pin-project-lite", "sync_wrapper 1.0.2", - "tokio 1.46.1", + "tokio", "tower-layer", "tower-service", "tracing", ] -[[package]] -name = "tower-buffer" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4887dc2a65d464c8b9b66e0e4d51c2fd6cf5b3373afc72805b0a60bce00446a" -dependencies = [ - "futures-core", - "pin-project 0.4.30", - "tokio 0.2.25", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-discover" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f6b5000c3c54d269cc695dff28136bb33d08cbf1df2c48129e143ab65bf3c2a" -dependencies = [ - "futures-core", - "pin-project 0.4.30", - "tower-service", -] - [[package]] name = "tower-http" version = "0.4.4" @@ -6463,13 +6387,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" dependencies = [ "bitflags 2.9.1", - "bytes 1.10.1", + "bytes", "futures-core", "futures-util", "http 0.2.12", "http-body 0.4.6", "http-range-header 0.3.1", - "pin-project-lite 0.2.16", + "pin-project-lite", "tower 0.4.13", "tower-layer", "tower-service", @@ -6478,45 +6402,30 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.5.2" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" +checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2" dependencies = [ "bitflags 2.9.1", - "bytes 1.10.1", + "bytes", + "futures-core", "futures-util", "http 1.3.1", "http-body 1.0.1", "http-body-util", "http-range-header 0.4.2", "httpdate", + "iri-string", "mime", "mime_guess", "percent-encoding", - "pin-project-lite 0.2.16", - "tokio 1.46.1", + "pin-project-lite", + "tokio", "tokio-util", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-http" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2" -dependencies = [ - "bitflags 2.9.1", - "bytes 1.10.1", - "futures-util", - "http 1.3.1", - "http-body 1.0.1", - "iri-string", - "pin-project-lite 0.2.16", "tower 0.5.2", "tower-layer", "tower-service", + "tracing", ] [[package]] @@ -6525,89 +6434,12 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" -[[package]] -name = "tower-limit" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92c3040c5dbed68abffaa0d4517ac1a454cd741044f33ab0eefab6b8d1361404" -dependencies = [ - "futures-core", - "pin-project 0.4.30", - "tokio 0.2.25", - "tower-layer", - "tower-load", - "tower-service", -] - -[[package]] -name = "tower-load" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cc79fc3afd07492b7966d7efa7c6c50f8ed58d768a6075dd7ae6591c5d2017b" -dependencies = [ - "futures-core", - "log", - "pin-project 0.4.30", - "tokio 0.2.25", - "tower-discover", - "tower-service", -] - -[[package]] -name = "tower-load-shed" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f021e23900173dc315feb4b6922510dae3e79c689b74c089112066c11f0ae4e" -dependencies = [ - "futures-core", - "pin-project 0.4.30", - "tower-layer", - "tower-service", -] - -[[package]] -name = "tower-retry" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6727956aaa2f8957d4d9232b308fe8e4e65d99db30f42b225646e86c9b6a952" -dependencies = [ - "futures-core", - "pin-project 0.4.30", - "tokio 0.2.25", - "tower-layer", - "tower-service", -] - [[package]] name = "tower-service" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" -[[package]] -name = "tower-timeout" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "127b8924b357be938823eaaec0608c482d40add25609481027b96198b2e4b31e" -dependencies = [ - "pin-project 0.4.30", - "tokio 0.2.25", - "tower-layer", - "tower-service", -] - -[[package]] -name = "tower-util" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1093c19826d33807c72511e68f73b4a0469a3f22c2bd5f7d5212178b4b89674" -dependencies = [ - "futures-core", - "futures-util", - "pin-project 0.4.30", - "tower-service", -] - [[package]] name = "tracing" version = "0.1.41" @@ -6615,7 +6447,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ "log", - "pin-project-lite 0.2.16", + "pin-project-lite", "tracing-attributes", "tracing-core", ] @@ -6695,15 +6527,15 @@ name = "transport" version = "0.0.0" dependencies = [ "anyhow", - "bytes 1.10.1", + "bytes", "futures-core", "futures-sink", "futures-util", "parking_lot", - "pin-project-lite 0.2.16", + "pin-project-lite", "proptest", "test-utils", - "tokio 1.46.1", + "tokio", "tracing", ] @@ -6719,14 +6551,31 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4793cb5e56680ecbb1d843515b23b6de9a75eb04b66643e256a396d43be33c13" dependencies = [ - "bytes 1.10.1", + "bytes", + "data-encoding", + "http 1.3.1", + "httparse", + "log", + "rand 0.9.1", + "sha1", + "thiserror 2.0.12", + "utf-8", +] + +[[package]] +name = "tungstenite" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eadc29d668c91fcc564941132e17b28a7ceb2f3ebf0b9dae3e03fd7a6748eb0d" +dependencies = [ + "bytes", "data-encoding", "http 1.3.1", "httparse", "log", "native-tls", "rand 0.9.1", - "rustls 0.23.28", + "rustls 0.23.29", "rustls-pki-types", "sha1", "thiserror 2.0.12", @@ -6944,8 +6793,8 @@ dependencies = [ "futures-util", "num_cpus", "thiserror 2.0.12", - "tokio 1.46.1", - "tokio-tungstenite", + "tokio", + "tokio-tungstenite 0.27.0", "tokio-util", "tracing", "tracing-subscriber", diff --git a/crates/devolutions-pedm-shared/Cargo.toml b/crates/devolutions-pedm-shared/Cargo.toml index ce457ce6a..8debddedb 100644 --- a/crates/devolutions-pedm-shared/Cargo.toml +++ b/crates/devolutions-pedm-shared/Cargo.toml @@ -11,7 +11,7 @@ publish = false anyhow = { version = "1.0", optional = true } 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 +hyper = { version = "~1.6", features = ["client", "http1"], optional = true } # old version required for OpenAPI generator serde_json = { version = "1.0", optional = true } tokio = { version = "1.45", features = ["net", "sync"], optional = true } glob = { version = "0.3", optional = true } @@ -19,7 +19,7 @@ regex = { version = "1.11", optional = true } schemars = { version = "0.8", features = ["uuid1"], 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 +tower = { version = "0.5", optional = true } # old version required for OpenAPI generator pin-project = { version = "1.1", optional = true } uuid = { version = "1", features = ["v4", "serde"]} dunce = "1.0" diff --git a/crates/devolutions-pedm/Cargo.toml b/crates/devolutions-pedm/Cargo.toml index 31539a86c..ec554fdb8 100644 --- a/crates/devolutions-pedm/Cargo.toml +++ b/crates/devolutions-pedm/Cargo.toml @@ -33,7 +33,7 @@ camino = { version = "1", features = ["serde1"] } async-trait = "0.1" tracing = "0.1" aide = { version = "0.14", features = ["axum", "axum-extra", "axum-json", "axum-tokio"] } -tower-http = { version = "0.5", features = ["timeout"] } +tower-http = { version = "0.6", features = ["timeout"] } parking_lot = "0.12" cfg-if = "1.0" uuid = "1" diff --git a/crates/test-utils/Cargo.toml b/crates/test-utils/Cargo.toml index 0129826c0..9d3898f53 100644 --- a/crates/test-utils/Cargo.toml +++ b/crates/test-utils/Cargo.toml @@ -11,7 +11,7 @@ workspace = true [dependencies] transport = { path = "../transport" } tokio = { version = "1.45", features = ["io-util"] } -tokio-tungstenite = "0.26" +tokio-tungstenite = "0.27" futures-util = "0.3" proptest = "1.7" anyhow = "1.0" diff --git a/crates/video-streamer/Cargo.toml b/crates/video-streamer/Cargo.toml index bb1eb2785..52b7b4dc6 100644 --- a/crates/video-streamer/Cargo.toml +++ b/crates/video-streamer/Cargo.toml @@ -35,7 +35,7 @@ tokio = { version = "1.45", features = [ ] } axum = { version = "0.8", features = ["ws"] } futures = "0.3" -tokio-tungstenite = "0.26" +tokio-tungstenite = "0.27" transport = { path = "../transport" } [lints] diff --git a/devolutions-gateway/Cargo.toml b/devolutions-gateway/Cargo.toml index c82285bbd..3e5379995 100644 --- a/devolutions-gateway/Cargo.toml +++ b/devolutions-gateway/Cargo.toml @@ -88,9 +88,9 @@ hyper = "1.6" hyper-util = { version = "0.1", features = ["tokio", "server", "server-auto"] } axum = { version = "0.8", default-features = false, features = ["http1", "json", "ws", "query", "tracing", "tower-log"] } axum-extra = { version = "0.10", features = ["query", "async-read-body", "typed-header"] } -tower-http = { version = "0.5", features = ["cors", "fs"] } +tower-http = { version = "0.6", features = ["cors", "fs"] } tungstenite = "0.26" # Should be the same version as `axum` (we perform error downcasting for better error reporting) -tokio-tungstenite = { version = "0.26", features = ["rustls-tls-native-roots"] } # Should use the same version of tungstenite as `axum` +tokio-tungstenite = { version = "0.27", features = ["rustls-tls-native-roots"] } # Should use the same version of tungstenite as `axum` http-body-util = "0.1" # OpenAPI generator @@ -117,7 +117,7 @@ etherparse = "0.15" portpicker = "0.1" [target.'cfg(windows)'.dependencies] -rustls-cng = { version = "0.5", default-features = false, features = ["logging", "tls12", "ring"] } +rustls-cng = { version = "0.6", default-features = false, features = ["logging", "tls12", "ring"] } [target.'cfg(windows)'.build-dependencies] embed-resource = "3.0" diff --git a/jetsocat/Cargo.toml b/jetsocat/Cargo.toml index f04dc0f58..9dd6c2632 100644 --- a/jetsocat/Cargo.toml +++ b/jetsocat/Cargo.toml @@ -37,7 +37,7 @@ humantime = "2.2" # async tokio = { version = "1.45", features = ["io-std", "io-util", "net", "fs", "signal", "time", "rt", "sync", "process", "rt-multi-thread", "macros"] } -tokio-tungstenite = "0.26" +tokio-tungstenite = "0.27" futures-util = "0.3" transport = { path = "../crates/transport" }