diff --git a/Cargo.lock b/Cargo.lock index f9b2bd541..dd6ef5ffe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -91,7 +91,7 @@ version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2477554ebf38aea815a9c4729100cfc32f766876c45b9c9c38ef221b9d1a703" dependencies = [ - "axum 0.8.7", + "axum 0.8.8", "axum-extra", "bytes 1.11.0", "cfg-if", @@ -198,9 +198,9 @@ dependencies = [ [[package]] name = "assert_cmd" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcbb6924530aa9e0432442af08bbcafdad182db80d2e560da42a6d442535bf85" +checksum = "9c5bcfa8749ac45dd12cb11055aeeb6b27a3895560d60d71e3c23bf979e60514" dependencies = [ "anstyle", "bstr", @@ -371,9 +371,9 @@ dependencies = [ [[package]] name = "axum" -version = "0.8.7" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b098575ebe77cb6d14fc7f32749631a6e44edbef6b796f89b020e99ba20d425" +checksum = "8b52af3cb4058c895d37317bb27508dccc8e5f2d39454016b297bf4a400597b8" dependencies = [ "axum-core 0.5.5", "base64 0.22.1", @@ -447,7 +447,7 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9963ff19f40c6102c76756ef0a46004c0d58957d87259fc9208ff8441c12ab96" dependencies = [ - "axum 0.8.7", + "axum 0.8.8", "axum-core 0.5.5", "bytes 1.11.0", "form_urlencoded", @@ -1324,7 +1324,7 @@ dependencies = [ "anyhow", "argon2", "async-trait", - "axum 0.8.7", + "axum 0.8.8", "axum-extra", "backoff", "bitflags 2.10.0", @@ -1453,7 +1453,7 @@ dependencies = [ "aide", "anyhow", "async-trait", - "axum 0.8.7", + "axum 0.8.8", "base16ct 0.2.0", "base64 0.22.1", "bb8", @@ -2623,7 +2623,7 @@ dependencies = [ "http 1.4.0", "hyper 1.8.1", "hyper-util", - "rustls 0.23.35", + "rustls 0.23.36", "rustls-native-certs", "rustls-pki-types", "tokio 1.48.0", @@ -3229,13 +3229,13 @@ dependencies = [ "mcp-proxy", "native-tls", "openssl", - "openssl-probe", + "openssl-probe 0.1.6", "proptest", "proxy-http", "proxy-socks", "proxy-types", "proxy_cfg", - "rustls 0.23.35", + "rustls 0.23.36", "rustls-native-certs", "rustls-pemfile 2.2.0", "seahorse", @@ -3458,9 +3458,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.178" +version = "0.2.180" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091" +checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc" [[package]] name = "libloading" @@ -3915,7 +3915,7 @@ dependencies = [ "libc", "log", "openssl", - "openssl-probe", + "openssl-probe 0.1.6", "openssl-sys", "schannel", "security-framework 2.11.1", @@ -3973,9 +3973,9 @@ dependencies = [ [[package]] name = "network-interface" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e79101e6efcffacab279462884a7eebf65ea5f4ac2cc727b60c715a9aa04722" +checksum = "4ddcb8865ad3d9950f22f42ffa0ef0aecbfbf191867b3122413602b0a360b2a6" dependencies = [ "cc", "libc", @@ -4316,6 +4316,12 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" +[[package]] +name = "openssl-probe" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f50d9b3dabb09ecd771ad0aa242ca6894994c130308ca3d7684634df8037391" + [[package]] name = "openssl-sys" version = "0.9.111" @@ -5118,7 +5124,7 @@ dependencies = [ "quinn-proto", "quinn-udp", "rustc-hash 2.1.1", - "rustls 0.23.35", + "rustls 0.23.36", "socket2 0.6.1", "thiserror 2.0.17", "tokio 1.48.0", @@ -5138,7 +5144,7 @@ dependencies = [ "rand 0.9.2", "ring 0.17.14", "rustc-hash 2.1.1", - "rustls 0.23.35", + "rustls 0.23.36", "rustls-pki-types", "slab", "thiserror 2.0.17", @@ -5387,7 +5393,7 @@ dependencies = [ "percent-encoding", "pin-project-lite 0.2.16", "quinn", - "rustls 0.23.35", + "rustls 0.23.36", "rustls-native-certs", "rustls-pki-types", "serde", @@ -5606,9 +5612,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.35" +version = "0.23.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "533f54bc6a7d4f647e46ad909549eda97bf5afc1585190ef692b4286b198bd8f" +checksum = "c665f33d38cea657d9614f766881e4d510e0eda4239891eea56b4cadcf01801b" dependencies = [ "aws-lc-rs", "log", @@ -5626,18 +5632,18 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c742cb7d8e43daae2dd9ca4b1da442b4500a461ce1c84249e6ac99b4bc12562e" dependencies = [ - "rustls 0.23.35", + "rustls 0.23.36", "sha2 0.10.9", "windows-sys 0.59.0", ] [[package]] name = "rustls-native-certs" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9980d917ebb0c0536119ba501e90834767bffc3d60641457fd84a1f3fd337923" +checksum = "612460d5f7bea540c490b2b6395d8e34a953e52b491accd6c86c8164c5932a63" dependencies = [ - "openssl-probe", + "openssl-probe 0.2.0", "rustls-pki-types", "schannel", "security-framework 3.5.1", @@ -5926,15 +5932,15 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.145" +version = "1.0.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" +checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" dependencies = [ "itoa", "memchr", - "ryu", "serde", "serde_core", + "zmij", ] [[package]] @@ -5954,7 +5960,7 @@ version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b417bedc008acbdf6d6b4bc482d29859924114bbe2650b7921fb68a261d0aa6" dependencies = [ - "axum 0.8.7", + "axum 0.8.8", "futures", "percent-encoding", "serde", @@ -6134,9 +6140,9 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] name = "smol_str" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3498b0a27f93ef1402f20eefacfaa1691272ac4eca1cdc8c596cb0a245d6cbf5" +checksum = "0f7a918bd2a9951d18ee6e48f076843e8e73a9a5d22cf05bcd4b7a81bdd04e17" dependencies = [ "borsh", "serde_core", @@ -6247,7 +6253,7 @@ dependencies = [ "rand 0.9.2", "reqwest", "rsa", - "rustls 0.23.35", + "rustls 0.23.36", "rustls-native-certs", "serde", "sha1 0.11.0-rc.2", @@ -6551,9 +6557,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.44" +version = "0.3.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d" +checksum = "f9e442fc33d7fdb45aa9bfeb312c095964abdf596f7567261062b2a7107aaabd" dependencies = [ "deranged", "itoa", @@ -6562,22 +6568,22 @@ dependencies = [ "num-conv", "num_threads", "powerfmt", - "serde", + "serde_core", "time-core", "time-macros", ] [[package]] name = "time-core" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b" +checksum = "8b36ee98fd31ec7426d599183e8fe26932a8dc1fb76ddb6214d05493377d34ca" [[package]] name = "time-macros" -version = "0.2.24" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3" +checksum = "71e552d1249bf61ac2a52db88179fd0673def1e1ad8243a00d9ec9ed71fee3dd" dependencies = [ "num-conv", "time-core", @@ -6748,7 +6754,7 @@ version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" dependencies = [ - "rustls 0.23.35", + "rustls 0.23.36", "tokio 1.48.0", ] @@ -6765,12 +6771,10 @@ dependencies = [ [[package]] name = "tokio-test" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2468baabc3311435b55dd935f702f42cd1b8abb7e754fb7dfb16bd36aa88f9f7" +checksum = "3f6d24790a10a7af737693a3e8f1d03faef7e6ca0cc99aae5066f533766de545" dependencies = [ - "async-stream", - "bytes 1.11.0", "futures-core", "tokio 1.48.0", "tokio-stream", @@ -6785,7 +6789,7 @@ dependencies = [ "futures-util", "log", "native-tls", - "rustls 0.23.35", + "rustls 0.23.36", "rustls-native-certs", "rustls-pki-types", "tokio 1.48.0", @@ -6808,9 +6812,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.17" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2efa149fe76073d6e8fd97ef4f4eca7b67f599660115591483572e406e165594" +checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098" dependencies = [ "bytes 1.11.0", "futures-core", @@ -7292,7 +7296,7 @@ dependencies = [ "log", "native-tls", "rand 0.9.2", - "rustls 0.23.35", + "rustls 0.23.36", "rustls-pki-types", "sha1 0.10.6", "thiserror 2.0.17", @@ -7446,7 +7450,7 @@ dependencies = [ "flate2", "log", "once_cell", - "rustls 0.23.35", + "rustls 0.23.36", "rustls-pki-types", "url", "webpki-roots 0.26.11", @@ -7454,14 +7458,15 @@ dependencies = [ [[package]] name = "url" -version = "2.5.7" +version = "2.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b" +checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed" dependencies = [ "form_urlencoded", "idna", "percent-encoding", "serde", + "serde_derive", ] [[package]] @@ -7537,7 +7542,7 @@ name = "video-streamer" version = "0.0.0" dependencies = [ "anyhow", - "axum 0.8.7", + "axum 0.8.8", "cadeau", "ebml-iterable", "futures", @@ -8601,6 +8606,12 @@ dependencies = [ "syn 2.0.111", ] +[[package]] +name = "zmij" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd8f3f50b848df28f887acb68e41201b5aea6bc8a8dacc00fb40635ff9a72fea" + [[package]] name = "zstd-safe" version = "7.2.4" diff --git a/crates/http-client-proxy/Cargo.toml b/crates/http-client-proxy/Cargo.toml index e45a6d65b..cb2509256 100644 --- a/crates/http-client-proxy/Cargo.toml +++ b/crates/http-client-proxy/Cargo.toml @@ -12,7 +12,7 @@ workspace = true proxy_cfg = "0.4" reqwest = { version = "0.12", default-features = false } anyhow = "1.0" -url = "2.5" +url = { version = "2.5", features = ["serde"] } tracing = "0.1" ipnet = "2.10" parking_lot = "0.12" diff --git a/devolutions-agent/Cargo.toml b/devolutions-agent/Cargo.toml index b5bde9ae7..4a9a34b2f 100644 --- a/devolutions-agent/Cargo.toml +++ b/devolutions-agent/Cargo.toml @@ -31,7 +31,7 @@ serde = { version = "1", features = ["derive"] } tap = "1.0" tokio-rustls = { version = "0.26", default-features = false, features = ["logging", "tls12", "ring"] } tracing = "0.1" -url = "2.5" +url = { version = "2.5", features = ["serde"] } [dependencies.ironrdp] version = "0.14" diff --git a/testsuite/Cargo.toml b/testsuite/Cargo.toml index 0e9dbce02..1337cce70 100644 --- a/testsuite/Cargo.toml +++ b/testsuite/Cargo.toml @@ -17,7 +17,7 @@ harness = true [dependencies] anyhow = "1.0" -assert_cmd = "2.0" +assert_cmd = "2.1" dynosaur = "0.3" escargot = "0.5" expect-test = "1.5" diff --git a/testsuite/tests/cli/jetsocat.rs b/testsuite/tests/cli/jetsocat.rs index c046bea6e..57996b9d3 100644 --- a/testsuite/tests/cli/jetsocat.rs +++ b/testsuite/tests/cli/jetsocat.rs @@ -268,7 +268,8 @@ fn jmux_proxy_write_hello_world() { format!("forward tcp://127.0.0.1:{proxy_listen_port} 'cmd://echo hello world'"), ) .timeout(COMMAND_TIMEOUT) - .assert(); + .assert() + .success(); // Kill all processes. let _ = jmux_client.kill();