diff --git a/Cargo.lock b/Cargo.lock index d335c928..637b4539 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -78,7 +78,7 @@ checksum = "7b0e3b97a21e41ec5c19bfd9b4fc1f7086be104f8b988681230247ffc91cc8ed" dependencies = [ "axum", "axum-extra", - "bytes 1.6.1", + "bytes", "cfg-if", "http 1.1.0", "indexmap", @@ -190,7 +190,7 @@ dependencies = [ "log", "pin-utils", "pkg-config", - "tokio 1.38.1", + "tokio", "winapi", ] @@ -224,7 +224,7 @@ checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" dependencies = [ "async-stream-impl", "futures-core", - "pin-project-lite 0.2.14", + "pin-project-lite", ] [[package]] @@ -302,14 +302,14 @@ dependencies = [ [[package]] name = "axum" -version = "0.7.5" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" +checksum = "504e3947307ac8326a5437504c517c4b56716c9d98fac0028c2acc7ca47d70ae" dependencies = [ "async-trait", "axum-core", - "base64 0.21.7", - "bytes 1.6.1", + "base64 0.22.1", + "bytes", "futures-util", "http 1.1.0", "http-body 1.0.1", @@ -321,7 +321,7 @@ dependencies = [ "memchr", "mime", "percent-encoding", - "pin-project-lite 0.2.14", + "pin-project-lite", "rustversion", "serde", "serde_json", @@ -329,9 +329,9 @@ dependencies = [ "serde_urlencoded", "sha1", "sync_wrapper 1.0.1", - "tokio 1.38.1", - "tokio-tungstenite", - "tower 0.4.13", + "tokio", + "tokio-tungstenite 0.24.0", + "tower 0.5.1", "tower-layer", "tower-service", "tracing", @@ -339,20 +339,20 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" +checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" dependencies = [ "async-trait", - "bytes 1.6.1", + "bytes", "futures-util", "http 1.1.0", "http-body 1.0.1", "http-body-util", "mime", - "pin-project-lite 0.2.14", + "pin-project-lite", "rustversion", - "sync_wrapper 0.1.2", + "sync_wrapper 1.0.1", "tower-layer", "tower-service", "tracing", @@ -360,25 +360,25 @@ dependencies = [ [[package]] name = "axum-extra" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0be6ea09c9b96cb5076af0de2e383bd2bc0c18f827cf1967bdd353e0b910d733" +checksum = "73c3220b188aea709cf1b6c5f9b01c3bd936bb08bd2b5184a12b35ac8131b1f9" dependencies = [ "axum", "axum-core", - "bytes 1.6.1", + "bytes", "futures-util", "headers", "http 1.1.0", "http-body 1.0.1", "http-body-util", "mime", - "pin-project-lite 0.2.14", + "pin-project-lite", "serde", "serde_html_form", - "tokio 1.38.1", + "tokio", "tokio-util", - "tower 0.4.13", + "tower 0.5.1", "tower-layer", "tower-service", "tracing", @@ -572,12 +572,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.6.1" @@ -1010,7 +1004,7 @@ dependencies = [ "smallvec", "tap", "thiserror", - "tokio 1.38.1", + "tokio", "tokio-rustls 0.26.0", "tracing", "uuid", @@ -1040,7 +1034,7 @@ dependencies = [ "axum", "axum-extra", "backoff", - "bytes 1.6.1", + "bytes", "cadeau", "camino", "ceviche", @@ -1070,7 +1064,7 @@ dependencies = [ "pcap-file", "picky", "picky-krb 0.9.0", - "pin-project-lite 0.2.14", + "pin-project-lite", "portpicker", "proptest", "reqwest", @@ -1084,7 +1078,7 @@ dependencies = [ "tap", "thiserror", "time", - "tokio 1.38.1", + "tokio", "tokio-rustls 0.26.0", "tokio-test", "tower 0.4.13", @@ -1092,7 +1086,7 @@ dependencies = [ "tracing", "tracing-cov-mark", "transport", - "tungstenite", + "tungstenite 0.21.0", "typed-builder", "url", "utoipa", @@ -1115,7 +1109,7 @@ name = "devolutions-gateway-task" version = "0.0.0" dependencies = [ "async-trait", - "tokio 1.38.1", + "tokio", ] [[package]] @@ -1126,7 +1120,7 @@ dependencies = [ "async-trait", "camino", "devolutions-gateway-task", - "tokio 1.38.1", + "tokio", "tracing", "tracing-appender", "tracing-subscriber", @@ -1157,7 +1151,7 @@ dependencies = [ "serde_json", "sha1", "sha2", - "tokio 1.38.1", + "tokio", "tower-http", "tower-service", "tracing", @@ -1199,14 +1193,14 @@ dependencies = [ "anyhow", "devolutions-pedm-client-http", "glob", - "hyper 0.14.30", - "pin-project 1.1.5", + "hyper 1.4.1", + "pin-project", "regex", "schemars", "serde", "serde_json", - "tokio 1.38.1", - "tower 0.3.1", + "tokio", + "tower 0.4.13", "win-api-wrappers", "windows-registry", ] @@ -1219,7 +1213,7 @@ dependencies = [ "embed-resource", "fs_extra", "parking_lot", - "tokio 1.38.1", + "tokio", "win-api-wrappers", "windows-core 0.58.0", ] @@ -1639,7 +1633,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.14", + "pin-project-lite", "pin-utils", "slab", ] @@ -1738,7 +1732,7 @@ version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ - "bytes 1.6.1", + "bytes", "fnv", "futures-core", "futures-sink", @@ -1746,7 +1740,7 @@ dependencies = [ "http 0.2.12", "indexmap", "slab", - "tokio 1.38.1", + "tokio", "tokio-util", "tracing", ] @@ -1758,14 +1752,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" dependencies = [ "atomic-waker", - "bytes 1.6.1", + "bytes", "fnv", "futures-core", "futures-sink", "http 1.1.0", "indexmap", "slab", - "tokio 1.38.1", + "tokio", "tokio-util", "tracing", ] @@ -1783,7 +1777,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "322106e6bd0cba2d5ead589ddb8150a13d7c4217cf80d7c4f682ca994ccc6aa9" dependencies = [ "base64 0.21.7", - "bytes 1.6.1", + "bytes", "headers-core", "http 1.1.0", "httpdate", @@ -1879,7 +1873,7 @@ version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ - "bytes 1.6.1", + "bytes", "fnv", "itoa", ] @@ -1890,7 +1884,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ - "bytes 1.6.1", + "bytes", "fnv", "itoa", ] @@ -1901,9 +1895,9 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ - "bytes 1.6.1", + "bytes", "http 0.2.12", - "pin-project-lite 0.2.14", + "pin-project-lite", ] [[package]] @@ -1912,7 +1906,7 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ - "bytes 1.6.1", + "bytes", "http 1.1.0", ] @@ -1922,11 +1916,11 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ - "bytes 1.6.1", + "bytes", "futures-util", "http 1.1.0", "http-body 1.0.1", - "pin-project-lite 0.2.14", + "pin-project-lite", ] [[package]] @@ -1959,7 +1953,7 @@ version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ - "bytes 1.6.1", + "bytes", "futures-channel", "futures-core", "futures-util", @@ -1969,9 +1963,9 @@ dependencies = [ "httparse", "httpdate", "itoa", - "pin-project-lite 0.2.14", + "pin-project-lite", "socket2", - "tokio 1.38.1", + "tokio", "tower-service", "tracing", "want", @@ -1983,7 +1977,7 @@ version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ - "bytes 1.6.1", + "bytes", "futures-channel", "futures-util", "h2 0.4.5", @@ -1992,9 +1986,9 @@ dependencies = [ "httparse", "httpdate", "itoa", - "pin-project-lite 0.2.14", + "pin-project-lite", "smallvec", - "tokio 1.38.1", + "tokio", "want", ] @@ -2009,9 +2003,9 @@ dependencies = [ "hyper 1.4.1", "hyper-util", "rustls 0.23.12", - "rustls-native-certs", + "rustls-native-certs 0.7.1", "rustls-pki-types", - "tokio 1.38.1", + "tokio", "tokio-rustls 0.26.0", "tower-service", ] @@ -2022,28 +2016,28 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ - "bytes 1.6.1", + "bytes", "hyper 0.14.30", "native-tls", - "tokio 1.38.1", + "tokio", "tokio-native-tls", ] [[package]] name = "hyper-util" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" dependencies = [ - "bytes 1.6.1", + "bytes", "futures-channel", "futures-util", "http 1.1.0", "http-body 1.0.1", "hyper 1.4.1", - "pin-project-lite 0.2.14", + "pin-project-lite", "socket2", - "tokio 1.38.1", + "tokio", "tower 0.4.13", "tower-service", "tracing", @@ -2198,7 +2192,7 @@ name = "ironrdp-async" version = "0.1.0" source = "git+https://github.com/Devolutions/IronRDP?rev=2e1a9ac88e38e7d92d893007bc25d0a05c365861#2e1a9ac88e38e7d92d893007bc25d0a05c365861" dependencies = [ - "bytes 1.6.1", + "bytes", "ironrdp-connector", "ironrdp-pdu", "tracing", @@ -2333,7 +2327,7 @@ dependencies = [ "ironrdp-rdpsnd", "ironrdp-svc", "ironrdp-tokio", - "tokio 1.38.1", + "tokio", "tokio-rustls 0.26.0", "tracing", ] @@ -2352,9 +2346,9 @@ name = "ironrdp-tokio" version = "0.1.0" source = "git+https://github.com/Devolutions/IronRDP?rev=2e1a9ac88e38e7d92d893007bc25d0a05c365861#2e1a9ac88e38e7d92d893007bc25d0a05c365861" dependencies = [ - "bytes 1.6.1", + "bytes", "ironrdp-async", - "tokio 1.38.1", + "tokio", ] [[package]] @@ -2403,8 +2397,8 @@ dependencies = [ "seahorse", "sysinfo", "test-utils", - "tokio 1.38.1", - "tokio-tungstenite", + "tokio", + "tokio-tungstenite 0.21.0", "tracing", "tracing-appender", "tracing-subscriber", @@ -2424,7 +2418,7 @@ dependencies = [ name = "jmux-proto" version = "0.0.0" dependencies = [ - "bytes 1.6.1", + "bytes", "jmux-generators", "proptest", "smol_str", @@ -2436,10 +2430,10 @@ version = "0.0.0" dependencies = [ "anyhow", "bitvec", - "bytes 1.6.1", + "bytes", "futures-util", "jmux-proto", - "tokio 1.38.1", + "tokio", "tokio-util", "tracing", ] @@ -2719,7 +2713,7 @@ version = "0.0.0" dependencies = [ "lazy_static", "loom", - "tokio 1.38.1", + "tokio", ] [[package]] @@ -2742,12 +2736,12 @@ dependencies = [ "async-trait", "awaitdrop", "bitflags 1.3.2", - "bytes 1.6.1", + "bytes", "futures", - "pin-project 1.1.5", + "pin-project", "rand", "thiserror", - "tokio 1.38.1", + "tokio", "tokio-util", "tracing", ] @@ -2812,13 +2806,13 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86b33524dc0968bfad349684447bfce6db937a9ac3332a1fe60c0c5a5ce63f21" dependencies = [ - "bytes 1.6.1", + "bytes", "futures", "log", "netlink-packet-core", "netlink-sys", "thiserror", - "tokio 1.38.1", + "tokio", ] [[package]] @@ -2827,11 +2821,11 @@ version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "416060d346fbaf1f23f9512963e3e878f1a78e707cb699ba9215761754244307" dependencies = [ - "bytes 1.6.1", + "bytes", "futures", "libc", "log", - "tokio 1.38.1", + "tokio", ] [[package]] @@ -2865,7 +2859,7 @@ dependencies = [ "serde", "socket2", "thiserror", - "tokio 1.38.1", + "tokio", "tracing", "tracing-subscriber", "typed-builder", @@ -2881,7 +2875,7 @@ dependencies = [ "polling 3.7.3", "socket2", "thiserror", - "tokio 1.38.1", + "tokio", "tracing", "tracing-cov-mark", "tracing-subscriber", @@ -2905,7 +2899,7 @@ dependencies = [ "async-trait", "awaitdrop", "base64 0.13.1", - "bytes 1.6.1", + "bytes", "futures", "hostname 0.3.1", "muxado", @@ -2916,7 +2910,7 @@ dependencies = [ "serde", "serde_json", "thiserror", - "tokio 1.38.1", + "tokio", "tokio-retry", "tokio-util", "tracing", @@ -3464,33 +3458,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.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ - "pin-project-internal 1.1.5", -] - -[[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.86", - "quote 1.0.36", - "syn 1.0.109", + "pin-project-internal", ] [[package]] @@ -3504,12 +3478,6 @@ dependencies = [ "syn 2.0.72", ] -[[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.14" @@ -3561,7 +3529,7 @@ dependencies = [ "concurrent-queue", "libc", "log", - "pin-project-lite 0.2.14", + "pin-project-lite", "windows-sys 0.48.0", ] @@ -3574,7 +3542,7 @@ dependencies = [ "cfg-if", "concurrent-queue", "hermit-abi 0.4.0", - "pin-project-lite 0.2.14", + "pin-project-lite", "rustix", "tracing", "windows-sys 0.59.0", @@ -3715,12 +3683,12 @@ dependencies = [ name = "proxy-http" version = "0.0.0" dependencies = [ - "bytes 1.6.1", - "pin-project-lite 0.2.14", + "bytes", + "pin-project-lite", "proptest", "proxy-generators", "proxy-types", - "tokio 1.38.1", + "tokio", ] [[package]] @@ -3730,7 +3698,7 @@ dependencies = [ "proxy-http", "proxy-socks", "proxy-types", - "tokio 1.38.1", + "tokio", ] [[package]] @@ -3740,7 +3708,7 @@ dependencies = [ "proptest", "proxy-generators", "proxy-types", - "tokio 1.38.1", + "tokio", "tokio-test", ] @@ -3750,7 +3718,7 @@ version = "0.0.0" dependencies = [ "proxy-http", "proxy-socks", - "tokio 1.38.1", + "tokio", ] [[package]] @@ -3782,14 +3750,14 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad" dependencies = [ - "bytes 1.6.1", - "pin-project-lite 0.2.14", + "bytes", + "pin-project-lite", "quinn-proto", "quinn-udp", "rustc-hash 1.1.0", "rustls 0.23.12", "thiserror", - "tokio 1.38.1", + "tokio", "tracing", ] @@ -3799,7 +3767,7 @@ version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" dependencies = [ - "bytes 1.6.1", + "bytes", "rand", "ring 0.17.8", "rustc-hash 2.0.0", @@ -4008,12 +3976,12 @@ checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2" [[package]] name = "reqwest" -version = "0.12.5" +version = "0.12.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" +checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b" dependencies = [ "base64 0.22.1", - "bytes 1.6.1", + "bytes", "futures-core", "futures-util", "http 1.1.0", @@ -4028,24 +3996,24 @@ dependencies = [ "mime", "once_cell", "percent-encoding", - "pin-project-lite 0.2.14", + "pin-project-lite", "quinn", "rustls 0.23.12", - "rustls-native-certs", + "rustls-native-certs 0.8.0", "rustls-pemfile 2.2.0", "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", "sync_wrapper 1.0.1", - "tokio 1.38.1", + "tokio", "tokio-rustls 0.26.0", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "winreg 0.52.0", + "windows-registry", ] [[package]] @@ -4169,7 +4137,7 @@ dependencies = [ "netlink-sys", "nix 0.27.1", "thiserror", - "tokio 1.38.1", + "tokio", ] [[package]] @@ -4287,6 +4255,19 @@ dependencies = [ "security-framework", ] +[[package]] +name = "rustls-native-certs" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" +dependencies = [ + "openssl-probe", + "rustls-pemfile 2.2.0", + "rustls-pki-types", + "schannel", + "security-framework", +] + [[package]] name = "rustls-pemfile" version = "1.0.4" @@ -4761,7 +4742,7 @@ dependencies = [ "sha1", "sha2", "time", - "tokio 1.38.1", + "tokio", "tracing", "url", "uuid", @@ -4822,6 +4803,9 @@ name = "sync_wrapper" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] [[package]] name = "synstructure" @@ -4885,8 +4869,8 @@ dependencies = [ "futures-util", "portpicker", "proptest", - "tokio 1.38.1", - "tokio-tungstenite", + "tokio", + "tokio-tungstenite 0.21.0", "transport", ] @@ -4998,18 +4982,6 @@ dependencies = [ "syn 2.0.72", ] -[[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.38.1" @@ -5017,12 +4989,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df" dependencies = [ "backtrace", - "bytes 1.6.1", + "bytes", "libc", "mio", "num_cpus", "parking_lot", - "pin-project-lite 0.2.14", + "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", @@ -5048,7 +5020,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" dependencies = [ "native-tls", - "tokio 1.38.1", + "tokio", ] [[package]] @@ -5057,9 +5029,9 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f" dependencies = [ - "pin-project 1.1.5", + "pin-project", "rand", - "tokio 1.38.1", + "tokio", ] [[package]] @@ -5070,7 +5042,7 @@ checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ "rustls 0.22.4", "rustls-pki-types", - "tokio 1.38.1", + "tokio", ] [[package]] @@ -5081,7 +5053,7 @@ checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ "rustls 0.23.12", "rustls-pki-types", - "tokio 1.38.1", + "tokio", ] [[package]] @@ -5091,8 +5063,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", - "pin-project-lite 0.2.14", - "tokio 1.38.1", + "pin-project-lite", + "tokio", ] [[package]] @@ -5102,9 +5074,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2468baabc3311435b55dd935f702f42cd1b8abb7e754fb7dfb16bd36aa88f9f7" dependencies = [ "async-stream", - "bytes 1.6.1", + "bytes", "futures-core", - "tokio 1.38.1", + "tokio", "tokio-stream", ] @@ -5118,12 +5090,24 @@ dependencies = [ "log", "native-tls", "rustls 0.22.4", - "rustls-native-certs", + "rustls-native-certs 0.7.1", "rustls-pki-types", - "tokio 1.38.1", + "tokio", "tokio-native-tls", "tokio-rustls 0.25.0", - "tungstenite", + "tungstenite 0.21.0", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edc5f74e248dc973e0dbb7b74c7e0d6fcc301c694ff50049504004ef4d0cdcd9" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite 0.24.0", ] [[package]] @@ -5132,12 +5116,12 @@ version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ - "bytes 1.6.1", + "bytes", "futures-core", "futures-io", "futures-sink", - "pin-project-lite 0.2.14", - "tokio 1.38.1", + "pin-project-lite", + "tokio", ] [[package]] @@ -5185,24 +5169,6 @@ dependencies = [ "winnow 0.6.14", ] -[[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" @@ -5211,39 +5177,30 @@ checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" dependencies = [ "futures-core", "futures-util", - "pin-project 1.1.5", - "pin-project-lite 0.2.14", - "tokio 1.38.1", + "pin-project", + "pin-project-lite", + "tokio", "tower-layer", "tower-service", "tracing", ] [[package]] -name = "tower-buffer" -version = "0.3.0" +name = "tower" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4887dc2a65d464c8b9b66e0e4d51c2fd6cf5b3373afc72805b0a60bce00446a" +checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" dependencies = [ "futures-core", - "pin-project 0.4.30", - "tokio 0.2.25", + "futures-util", + "pin-project-lite", + "sync_wrapper 0.1.2", + "tokio", "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.5.2" @@ -5251,7 +5208,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" dependencies = [ "bitflags 2.6.0", - "bytes 1.6.1", + "bytes", "futures-util", "http 1.1.0", "http-body 1.0.1", @@ -5261,8 +5218,8 @@ dependencies = [ "mime", "mime_guess", "percent-encoding", - "pin-project-lite 0.2.14", - "tokio 1.38.1", + "pin-project-lite", + "tokio", "tokio-util", "tower-layer", "tower-service", @@ -5271,92 +5228,15 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" - -[[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" +version = "0.3.3" 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", -] +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[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" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1093c19826d33807c72511e68f73b4a0469a3f22c2bd5f7d5212178b4b89674" -dependencies = [ - "futures-core", - "futures-util", - "pin-project 0.4.30", - "tower-service", -] +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -5365,7 +5245,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ "log", - "pin-project-lite 0.2.14", + "pin-project-lite", "tracing-attributes", "tracing-core", ] @@ -5448,10 +5328,10 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "pin-project-lite 0.2.14", + "pin-project-lite", "proptest", "test-utils", - "tokio 1.38.1", + "tokio", ] [[package]] @@ -5467,7 +5347,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" dependencies = [ "byteorder", - "bytes 1.6.1", + "bytes", "data-encoding", "http 1.1.0", "httparse", @@ -5482,6 +5362,24 @@ dependencies = [ "utf-8", ] +[[package]] +name = "tungstenite" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http 1.1.0", + "httparse", + "log", + "rand", + "sha1", + "thiserror", + "utf-8", +] + [[package]] name = "typed-builder" version = "0.19.1" diff --git a/crates/devolutions-pedm-shared/Cargo.toml b/crates/devolutions-pedm-shared/Cargo.toml index 773eeab7..66d9b46c 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.89", optional = true } serde = { version = "1.0.210", 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.4", features = ["client", "http1"], optional = true } # old version required for OpenAPI generator serde_json = { version = "1.0.128", optional = true } tokio = { version = "1.38.0", features = ["net", "sync"], optional = true } glob = { version = "0.3.1", optional = true } @@ -19,7 +19,7 @@ regex = { version = "1.10.6", optional = true } schemars = { version = "0.8.21", optional = true } windows-registry = { version = "0.2.0", 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.4", optional = true } # old version required for OpenAPI generator pin-project = { version = "1.1.5", optional = true } [features] diff --git a/crates/devolutions-pedm/Cargo.toml b/crates/devolutions-pedm/Cargo.toml index 6cd073b0..1bfdc5f4 100644 --- a/crates/devolutions-pedm/Cargo.toml +++ b/crates/devolutions-pedm/Cargo.toml @@ -16,15 +16,15 @@ base16ct = { version = "0.2.0", features = ["std", "alloc"] } base64 = "0.22.1" chrono = "0.4.38" digest = "0.10.7" -hyper = { version = "1.3.1", features = ["server"] } -hyper-util = { version = "0.1.5", features = ["tokio"] } +hyper = { version = "1.4.1", features = ["server"] } +hyper-util = { version = "0.1.7", features = ["tokio"] } schemars = "0.8.21" serde = "1.0.210" serde_json = "1.0.128" sha1 = "0.10.6" sha2 = "0.10.8" tokio = { version = "1.38.0", features = ["net", "rt-multi-thread"] } -tower-service = "0.3.2" +tower-service = "0.3.3" win-api-wrappers = { path = "../win-api-wrappers" } devolutions-pedm-shared = { path = "../devolutions-pedm-shared", features = ["policy"]} devolutions-gateway-task = { path = "../devolutions-gateway-task" }