From a2201bba6389e894833e7f5c2d4df09c7d957b5e Mon Sep 17 00:00:00 2001 From: Aviram Hassan Date: Wed, 12 Jun 2024 13:14:45 +0300 Subject: [PATCH] Update many dependencies (#2439) * Really wip * compiles * .. * lint * .. * .. * lint * fix * .. * .. * fixes * fml * .. * better? * .. * .. * .. * fix ci * updates * .. * .. * update lock file * schema * aa * Another one bites the dust * last bump before win --------- Co-authored-by: Razz4780 --- Cargo.lock | 1902 ++++++++++------- Cargo.toml | 63 +- changelog.d/+dep-update.changed.md | 1 + mirrord-schema.json | 1 + mirrord/agent/Cargo.toml | 22 +- mirrord/agent/src/client_connection.rs | 18 +- mirrord/agent/src/dns.rs | 8 +- mirrord/agent/src/namespace.rs | 4 +- mirrord/agent/src/sniffer.rs | 8 +- .../agent/src/steal/connections/filtered.rs | 8 +- mirrord/agent/src/steal/http/filter.rs | 1 + mirrord/analytics/Cargo.toml | 2 +- mirrord/auth/Cargo.toml | 9 +- mirrord/auth/src/credentials.rs | 10 +- mirrord/auth/src/error.rs | 4 + mirrord/cli/Cargo.toml | 4 +- mirrord/config/Cargo.toml | 4 +- mirrord/console/Cargo.toml | 2 +- mirrord/intproxy/src/proxies/incoming/http.rs | 2 +- mirrord/kube/Cargo.toml | 6 +- mirrord/layer/Cargo.toml | 13 +- mirrord/layer/src/error.rs | 2 +- mirrord/layer/src/socket/ops.rs | 6 +- .../layer/tests/apps/issue2438/src/main.rs | 10 +- mirrord/operator/Cargo.toml | 8 +- mirrord/protocol/Cargo.toml | 8 +- mirrord/protocol/src/dns.rs | 4 +- mirrord/protocol/src/error.rs | 2 +- mirrord/protocol/src/tcp.rs | 2 +- mirrord/sip/Cargo.toml | 2 +- mirrord/sip/src/lib.rs | 21 +- sample/rust/Cargo.toml | 2 +- tests/Cargo.toml | 4 +- tests/issue1317/Cargo.toml | 7 +- tests/rust-websockets/Cargo.toml | 2 +- tests/rust-websockets/src/main.rs | 16 +- 36 files changed, 1275 insertions(+), 913 deletions(-) create mode 100644 changelog.d/+dep-update.changed.md diff --git a/Cargo.lock b/Cargo.lock index faf593965a5..f8fe8e4903b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -16,21 +16,21 @@ dependencies = [ "pin-project-lite", "tokio", "tokio-util", - "tracing 0.1.40", + "tracing", ] [[package]] name = "actix-http" -version = "3.6.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d223b13fd481fc0d1f83bb12659ae774d9e3601814c68a0bc539731698cca743" +checksum = "4eb9843d84c775696c37d9a418bbb01b932629d01870722c0f13eb3f95e2536d" dependencies = [ "actix-codec", "actix-rt", "actix-service", "actix-utils", "ahash", - "base64 0.21.7", + "base64 0.22.1", "bitflags 2.5.0", "brotli", "bytes", @@ -39,7 +39,7 @@ dependencies = [ "encoding_rs", "flate2", "futures-core", - "h2", + "h2 0.3.26", "http 0.2.12", "httparse", "httpdate", @@ -54,7 +54,7 @@ dependencies = [ "smallvec", "tokio", "tokio-util", - "tracing 0.1.40", + "tracing", "zstd", ] @@ -65,20 +65,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] name = "actix-router" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d22475596539443685426b6bdadb926ad0ecaefdfc5fb05e5e3441f15463c511" +checksum = "13d324164c51f63867b57e73ba5936ea151b8a41a1d23d1031eeb9f70d0236f8" dependencies = [ "bytestring", + "cfg-if", "http 0.2.12", "regex", + "regex-lite", "serde", - "tracing 0.1.40", + "tracing", ] [[package]] @@ -103,9 +105,9 @@ dependencies = [ "futures-core", "futures-util", "mio", - "socket2 0.5.7", + "socket2", "tokio", - "tracing 0.1.40", + "tracing", ] [[package]] @@ -131,9 +133,9 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.5.1" +version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a6556ddebb638c2358714d853257ed226ece6023ef9364f23f0c70737ea984" +checksum = "b1cf67dadb19d7c95e5a299e2dda24193b89d5d4f33a3b9800888ede9e19aa32" dependencies = [ "actix-codec", "actix-http", @@ -160,11 +162,12 @@ dependencies = [ "once_cell", "pin-project-lite", "regex", + "regex-lite", "serde", "serde_json", "serde_urlencoded", "smallvec", - "socket2 0.5.7", + "socket2", "time", "url", ] @@ -178,7 +181,7 @@ dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -305,9 +308,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.83" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "apple-bundles" @@ -344,7 +347,7 @@ dependencies = [ "digest", "dirs", "elliptic-curve", - "env_logger", + "env_logger 0.10.2", "figment", "filetime", "glob", @@ -354,12 +357,12 @@ dependencies = [ "md-5", "minicbor", "num-traits", - "object", + "object 0.32.2", "oid-registry 0.6.1", "once_cell", "p12", "p256", - "pem 3.0.4", + "pem", "pkcs1", "pkcs8", "plist", @@ -367,8 +370,8 @@ dependencies = [ "rasn", "rayon", "regex", - "reqwest", - "ring 0.17.8", + "reqwest 0.11.27", + "ring", "rsa", "scroll", "security-framework", @@ -392,7 +395,7 @@ dependencies = [ "widestring", "windows-sys 0.52.0", "x509", - "x509-certificate 0.23.1", + "x509-certificate", "xml-rs", "yasna", "zeroize", @@ -431,7 +434,7 @@ dependencies = [ "log", "md-5", "rand", - "reqwest", + "reqwest 0.11.27", "scroll", "serde", "serde-xml-rs", @@ -440,7 +443,7 @@ dependencies = [ "signature", "thiserror", "url", - "x509-certificate 0.23.1", + "x509-certificate", "xml-rs", "xz2", ] @@ -502,7 +505,7 @@ checksum = "7378575ff571966e99a744addeff0bff98b8ada0dedf1956d59e634db95eaac1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", "synstructure 0.13.1", ] @@ -525,7 +528,7 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -538,17 +541,50 @@ dependencies = [ "serde_json", ] +[[package]] +name = "async-broadcast" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" +dependencies = [ + "event-listener", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + [[package]] name = "async-socks5" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77f634add2445eb2c1f785642a67ca1073fedd71e73dc3ca69435ef9b9bdedc7" +checksum = "8da2537846e16b96d2972ee52a3b355663872a1a687ce6d57a3b6f6b6a181c89" dependencies = [ - "async-trait", "thiserror", "tokio", ] +[[package]] +name = "async-stream" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "async-trait" version = "0.1.80" @@ -557,7 +593,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -569,12 +605,45 @@ dependencies = [ "bytemuck", ] +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "autocfg" version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +[[package]] +name = "aws-lc-rs" +version = "1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "474d7cec9d0a1126fad1b224b767fcbf351c23b0309bb21ec210bcfd379926a5" +dependencies = [ + "aws-lc-sys", + "mirai-annotations", + "paste", + "zeroize", +] + +[[package]] +name = "aws-lc-sys" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7505fc3cb7acbf42699a43a79dd9caa4ed9e99861dfbb837c5c0fb5a0a8d2980" +dependencies = [ + "bindgen", + "cc", + "cmake", + "dunce", + "fs_extra", + "libc", + "paste", +] + [[package]] name = "axum" version = "0.6.20" @@ -582,8 +651,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" dependencies = [ "async-trait", - "axum-core", - "base64 0.21.7", + "axum-core 0.3.4", "bitflags 1.3.2", "bytes", "futures-util", @@ -598,16 +666,47 @@ dependencies = [ "pin-project-lite", "rustversion", "serde", + "sync_wrapper 0.1.2", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" +dependencies = [ + "async-trait", + "axum-core 0.4.3", + "base64 0.21.7", + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.3.1", + "hyper-util", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", "serde_json", "serde_path_to_error", "serde_urlencoded", "sha1", - "sync_wrapper", + "sync_wrapper 1.0.1", "tokio", - "tokio-tungstenite 0.20.1", + "tokio-tungstenite 0.21.0", "tower", "tower-layer", "tower-service", + "tracing", ] [[package]] @@ -627,6 +726,27 @@ dependencies = [ "tower-service", ] +[[package]] +name = "axum-core" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper 0.1.2", + "tower-layer", + "tower-service", + "tracing", +] + [[package]] name = "backoff" version = "0.4.0" @@ -649,7 +769,7 @@ dependencies = [ "cfg-if", "libc", "miniz_oxide", - "object", + "object 0.32.2", "rustc-demangle", ] @@ -668,12 +788,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - [[package]] name = "base64" version = "0.21.7" @@ -729,24 +843,25 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.63.0" +version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "cexpr", "clang-sys", + "itertools 0.12.1", "lazy_static", "lazycell", "log", - "peeking_take_while", + "prettyplease", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 1.0.109", - "which", + "syn 2.0.66", + "which 4.4.2", ] [[package]] @@ -818,19 +933,22 @@ dependencies = [ [[package]] name = "bollard" -version = "0.14.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af254ed2da4936ef73309e9597180558821cb16ae9bba4cb24ce6b612d8d80ed" +checksum = "0aed08d3adb6ebe0eff737115056652670ae290f177759aac19c30456135f94c" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "bollard-stubs", "bytes", "futures-core", "futures-util", "hex", - "http 0.2.12", - "hyper 0.14.28", - "hyperlocal", + "http 1.1.0", + "http-body-util", + "hyper 1.3.1", + "hyper-named-pipe", + "hyper-util", + "hyperlocal-next", "log", "pin-project-lite", "serde", @@ -841,25 +959,27 @@ dependencies = [ "thiserror", "tokio", "tokio-util", + "tower-service", "url", "winapi", ] [[package]] name = "bollard-stubs" -version = "1.42.0-rc.7" +version = "1.44.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "602bda35f33aeb571cef387dcd4042c643a8bf689d8aaac2cc47ea24cb7bc7e0" +checksum = "709d9aa1c37abb89d40f19f5d0ad6f0d88cb1581264e571c9350fc5bb89cf1c5" dependencies = [ "serde", + "serde_repr", "serde_with", ] [[package]] name = "brotli" -version = "3.5.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391" +checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -868,9 +988,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.5.1" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" +checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -914,9 +1034,9 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" +checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" [[package]] name = "byteorder" @@ -989,9 +1109,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.97" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" dependencies = [ "jobserver", "libc", @@ -1013,6 +1133,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "chrono" version = "0.4.38" @@ -1062,9 +1188,9 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" +checksum = "a483f3cbf7cec2e153d424d0e92329d816becc6421389bd494375c6065921b9b" dependencies = [ "glob", "libc", @@ -1090,7 +1216,7 @@ dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.11.1", + "strsim", ] [[package]] @@ -1111,7 +1237,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -1120,12 +1246,30 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +[[package]] +name = "cmake" +version = "0.1.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" +dependencies = [ + "cc", +] + [[package]] name = "colorchoice" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "console" version = "0.15.8" @@ -1193,15 +1337,15 @@ checksum = "6051f239ecec86fde3410901ab7860d458d160371533842974fc61f96d15879b" [[package]] name = "containerd-client" -version = "0.3.0" -source = "git+https://github.com/containerd/rust-extensions?rev=35a97f17d55753bb1ef04c28cd7c3203993932b0#35a97f17d55753bb1ef04c28cd7c3203993932b0" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a39c07fb941da8bb545667ce3669b2a6f560d825ff957c50eda7494eeccdd88" dependencies = [ - "axum-core", "prost", "prost-types", "tokio", "tonic", - "tonic-build 0.9.2", + "tonic-build", "tower", ] @@ -1270,18 +1414,18 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam-channel" -version = "0.5.12" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ "crossbeam-utils", ] @@ -1307,9 +1451,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -1349,11 +1493,11 @@ dependencies = [ "bytes", "chrono", "hex", - "pem 3.0.4", - "reqwest", - "ring 0.17.8", + "pem", + "reqwest 0.11.27", + "ring", "signature", - "x509-certificate 0.23.1", + "x509-certificate", ] [[package]] @@ -1394,7 +1538,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" dependencies = [ "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -1427,14 +1571,14 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] name = "darling" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" dependencies = [ "darling_core", "darling_macro", @@ -1442,27 +1586,27 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", - "syn 2.0.63", + "strsim", + "syn 2.0.66", ] [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -1548,7 +1692,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -1558,7 +1702,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" dependencies = [ "derive_builder_core", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -1585,9 +1729,9 @@ dependencies = [ [[package]] name = "deunicode" -version = "1.4.4" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322ef0094744e63628e6f0eb2295517f79276a5b342a4c2ff3042566ca181d4e" +checksum = "339544cc9e2c4dc3fc7149fd630c5f22263a4fdf18a98afd0075784968b5cf00" [[package]] name = "dialoguer" @@ -1608,12 +1752,6 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" -[[package]] -name = "difflib" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" - [[package]] name = "digest" version = "0.10.7" @@ -1676,7 +1814,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -1707,6 +1845,12 @@ dependencies = [ "tokio", ] +[[package]] +name = "dunce" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" + [[package]] name = "dyn-clone" version = "1.0.17" @@ -1728,9 +1872,9 @@ dependencies = [ [[package]] name = "either" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" [[package]] name = "elliptic-curve" @@ -1774,14 +1918,14 @@ dependencies = [ [[package]] name = "enum-as-inner" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" +checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.66", ] [[package]] @@ -1793,7 +1937,17 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", +] + +[[package]] +name = "env_filter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +dependencies = [ + "log", + "regex", ] [[package]] @@ -1809,6 +1963,19 @@ dependencies = [ "termcolor", ] +[[package]] +name = "env_logger" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +dependencies = [ + "anstream", + "anstyle", + "env_filter", + "humantime", + "log", +] + [[package]] name = "equivalent" version = "1.0.1" @@ -1846,6 +2013,27 @@ dependencies = [ "libc", ] +[[package]] +name = "event-listener" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +dependencies = [ + "event-listener", + "pin-project-lite", +] + [[package]] name = "exec" version = "0.3.1" @@ -1869,12 +2057,13 @@ dependencies = [ [[package]] name = "fancy-regex" -version = "0.10.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0678ab2d46fa5195aaf59ad034c083d351377d4af57f3e073c074d0da3e3c766" +checksum = "531e46835a22af56d1e3b66f04844bed63158bc094a628bec1d321d9b4c44bf2" dependencies = [ "bit-set", - "regex", + "regex-automata 0.4.6", + "regex-syntax 0.8.3", ] [[package]] @@ -1895,20 +2084,20 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38793c55593b33412e3ae40c2c9781ffaa6f438f6f8c10f24e71846fbd7ae01e" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" [[package]] name = "figment" -version = "0.10.18" +version = "0.10.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d032832d74006f99547004d49410a4b4218e4c33382d56ca3ff89df74f86b953" +checksum = "8cb01cd46b0cf372153850f4c6c272d9cbea2da513e07538405148f95bd789f3" dependencies = [ "atomic", "pear", "serde", - "toml 0.8.12", + "toml 0.8.13", "uncased", "version_check", ] @@ -1940,9 +2129,19 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flaky_test" -version = "0.1.0" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "046caa1f23d7f751fc4ead3d6669a77fa5fc6cf6074960ddeb6a0b0a5b83c8da" +dependencies = [ + "flaky_test_impl", + "futures-util", +] + +[[package]] +name = "flaky_test_impl" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479cde5eb168cf5a056dd98f311cbfab7494c216394e4fb9eba0336827a8db93" +checksum = "85e35909c2f0552fdae5b40f1e95a7da12afb58c1f2f455a12c216c58d869abe" dependencies = [ "proc-macro2", "quote", @@ -1960,12 +2159,12 @@ dependencies = [ ] [[package]] -name = "float-cmp" -version = "0.9.0" +name = "fluent-uri" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" +checksum = "17c704e9dbe1ddd863da1e6ff3567795087b1eb201ce80d8fa81162e1516500d" dependencies = [ - "num-traits", + "bitflags 1.3.2", ] [[package]] @@ -1991,18 +2190,20 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frida-build" -version = "0.2.1" -source = "git+https://github.com/metalbear-co/frida-rust?branch=upgrade_frida_capstone#f7a1e8038ada5cc56a949927b687831d99a508b5" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c30ea8305152e97a11228532ece476b8174ff8454e63919fc7c7c60263ad5342" dependencies = [ - "reqwest", + "reqwest 0.12.4", "tar", "xz", ] [[package]] name = "frida-gum" -version = "0.13.2" -source = "git+https://github.com/metalbear-co/frida-rust?branch=upgrade_frida_capstone#f7a1e8038ada5cc56a949927b687831d99a508b5" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38241a5db26274a8873d675d6d4eeaffb5d23db41bab57472a07d56558d54687" dependencies = [ "cstr_core", "frida-gum-sys", @@ -2014,8 +2215,9 @@ dependencies = [ [[package]] name = "frida-gum-sys" -version = "0.8.1" -source = "git+https://github.com/metalbear-co/frida-rust?branch=upgrade_frida_capstone#f7a1e8038ada5cc56a949927b687831d99a508b5" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ea64581ea1b0128e36010edd431398f7198c78c9c8acc5a4a162cfc6f51fa9" dependencies = [ "bindgen", "frida-build", @@ -2023,16 +2225,21 @@ dependencies = [ [[package]] name = "fs4" -version = "0.6.6" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eeb4ed9e12f43b7fa0baae3f9cdda28352770132ef2e09a23760c29cae8bd47" +checksum = "73969b81e8bc90a3828d913dd3973d80771bfb9d7fbe1a78a79122aad456af15" dependencies = [ - "async-trait", "rustix", "tokio", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] +[[package]] +name = "fs_extra" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" + [[package]] name = "funty" version = "2.0.0" @@ -2095,7 +2302,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -2242,7 +2449,26 @@ dependencies = [ "slab", "tokio", "tokio-util", - "tracing 0.1.40", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.1.0", + "indexmap 2.2.6", + "slab", + "tokio", + "tokio-util", + "tracing", ] [[package]] @@ -2263,14 +2489,14 @@ dependencies = [ [[package]] name = "headers" -version = "0.3.9" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" +checksum = "322106e6bd0cba2d5ead589ddb8150a13d7c4217cf80d7c4f682ca994ccc6aa9" dependencies = [ "base64 0.21.7", "bytes", "headers-core", - "http 0.2.12", + "http 1.1.0", "httpdate", "mime", "sha1", @@ -2278,11 +2504,11 @@ dependencies = [ [[package]] name = "headers-core" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" +checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4" dependencies = [ - "http 0.2.12", + "http 1.1.0", ] [[package]] @@ -2310,19 +2536,66 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] -name = "hkdf" -version = "0.12.4" +name = "hickory-proto" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" +checksum = "07698b8420e2f0d6447a436ba999ec85d8fbf2a398bbd737b82cac4a2e96e512" dependencies = [ - "hmac", -] - -[[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" + "async-trait", + "cfg-if", + "data-encoding", + "enum-as-inner", + "futures-channel", + "futures-io", + "futures-util", + "idna 0.4.0", + "ipnet", + "once_cell", + "rand", + "serde", + "thiserror", + "tinyvec", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "hickory-resolver" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28757f23aa75c98f254cf0405e6d8c25b831b32921b050a66692427679b1f243" +dependencies = [ + "cfg-if", + "futures-util", + "hickory-proto", + "ipconfig", + "lru-cache", + "once_cell", + "parking_lot", + "rand", + "resolv-conf", + "serde", + "smallvec", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "hkdf" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" +dependencies = [ + "hmac", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ "digest", ] @@ -2382,40 +2655,34 @@ dependencies = [ [[package]] name = "http-body" -version = "1.0.0-rc.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "951dfc2e32ac02d67c90c0d65bd27009a635dc9b381a2cc7d284ab01e3a0150d" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" dependencies = [ "bytes", - "http 0.2.12", + "http 1.1.0", ] [[package]] name = "http-body-util" -version = "0.1.0-rc.3" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08ef12f041acdd397010e5fb6433270c147d3b8b2d0a840cd7fff8e531dca5c8" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", "futures-util", - "http 0.2.12", - "http-body 1.0.0-rc.2", + "http 1.1.0", + "http-body 1.0.0", "pin-project-lite", ] -[[package]] -name = "http-range-header" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" - [[package]] name = "http-serde" -version = "1.1.3" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f560b665ad9f1572cfcaf034f7fb84338a7ce945216d64a90fd81f046a3caee" +checksum = "1133cafcce27ea69d35e56b3a8772e265633e04de73c5f4e1afdffc1d19b5419" dependencies = [ - "http 0.2.12", + "http 1.1.0", "serde", ] @@ -2456,55 +2723,76 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2 0.5.7", + "socket2", "tokio", "tower-service", - "tracing 0.1.40", + "tracing", "want", ] [[package]] name = "hyper" -version = "1.0.0-rc.4" -source = "git+https://github.com/meowjesty/hyper?branch=master#d4a61e3da87a08a25772cd3aa2f503cb4346c81f" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" dependencies = [ "bytes", "futures-channel", "futures-util", - "h2", - "http 0.2.12", - "http-body 1.0.0-rc.2", + "h2 0.4.5", + "http 1.1.0", + "http-body 1.0.0", "httparse", "httpdate", "itoa", "pin-project-lite", + "smallvec", "tokio", - "tracing 0.1.40", "want", ] [[package]] -name = "hyper-proxy" -version = "0.9.1" +name = "hyper-http-proxy" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca815a891b24fdfb243fa3239c86154392b0953ee584aa1a2a1f66d20cbe75cc" +checksum = "5d06dbdfbacf34d996c6fb540a71a684a7aae9056c71951163af8a8a4c07b9a4" dependencies = [ "bytes", - "futures", + "futures-util", "headers", - "http 0.2.12", - "hyper 0.14.28", + "http 1.1.0", + "hyper 1.3.1", + "hyper-rustls 0.27.1", + "hyper-util", + "pin-project-lite", + "rustls-native-certs 0.7.0", "tokio", + "tokio-rustls 0.26.0", "tower-service", ] +[[package]] +name = "hyper-named-pipe" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73b7d8abf35697b81a825e386fc151e0d503e8cb5fcb93cc8669c376dfd6f278" +dependencies = [ + "hex", + "hyper 1.3.1", + "hyper-util", + "pin-project-lite", + "tokio", + "tower-service", + "winapi", +] + [[package]] name = "hyper-rustls" version = "0.24.2" @@ -2514,25 +2802,60 @@ dependencies = [ "futures-util", "http 0.2.12", "hyper 0.14.28", - "log", "rustls 0.21.12", - "rustls-native-certs 0.6.3", "tokio", "tokio-rustls 0.24.1", ] +[[package]] +name = "hyper-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" +dependencies = [ + "futures-util", + "http 1.1.0", + "hyper 1.3.1", + "hyper-util", + "rustls 0.22.4", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.25.0", + "tower-service", +] + +[[package]] +name = "hyper-rustls" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "908bb38696d7a037a01ebcc68a00634112ac2bbf8ca74e30a2c3d2f4f021302b" +dependencies = [ + "futures-util", + "http 1.1.0", + "hyper 1.3.1", + "hyper-util", + "log", + "rustls 0.23.8", + "rustls-native-certs 0.7.0", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.26.0", + "tower-service", +] + [[package]] name = "hyper-socks2" -version = "0.8.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc38166fc2732d450e9372388d269eb38ff0b75a3cfb4c542e65b2f6893629c4" +checksum = "51c227614c208f7e7c2e040526912604a1a957fe467c9c2f5b06c5d032337dab" dependencies = [ "async-socks5", - "futures", - "http 0.2.12", - "hyper 0.14.28", + "http 1.1.0", + "hyper 1.3.1", + "hyper-util", "thiserror", "tokio", + "tower-service", ] [[package]] @@ -2547,35 +2870,52 @@ dependencies = [ "tokio-io-timeout", ] +[[package]] +name = "hyper-timeout" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793" +dependencies = [ + "hyper 1.3.1", + "hyper-util", + "pin-project-lite", + "tokio", + "tower-service", +] + [[package]] name = "hyper-util" -version = "0.0.0" -source = "git+https://github.com/meowjesty/hyper-util?branch=issue/1869/update-runtime#fc9d572f0e8ce4a9f1c01f3420bf26ad4f2ab65e" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d8d52be92d09acc2e01dddb7fde3ad983fc6489c7db4837e605bc3fca4cb63e" dependencies = [ + "bytes", "futures-channel", "futures-util", - "http 0.2.12", - "hyper 1.0.0-rc.4", - "once_cell", + "http 1.1.0", + "http-body 1.0.0", + "hyper 1.3.1", "pin-project-lite", - "socket2 0.4.10", + "socket2", "tokio", "tower", "tower-service", - "tracing 0.1.40", + "tracing", ] [[package]] -name = "hyperlocal" -version = "0.8.0" +name = "hyperlocal-next" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fafdf7b2b2de7c9784f76e02c0935e65a8117ec3b768644379983ab333ac98c" +checksum = "acf569d43fa9848e510358c07b80f4adf34084ddc28c6a4a651ee8474c070dcc" dependencies = [ - "futures-util", "hex", - "hyper 0.14.28", - "pin-project", + "http-body-util", + "hyper 1.3.1", + "hyper-util", + "pin-project-lite", "tokio", + "tower-service", ] [[package]] @@ -2609,11 +2949,10 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.2.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ - "matches", "unicode-bidi", "unicode-normalization", ] @@ -2663,6 +3002,7 @@ checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown 0.14.5", + "serde", ] [[package]] @@ -2696,9 +3036,9 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", ] @@ -2709,10 +3049,10 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.7", + "socket2", "widestring", "windows-sys 0.48.0", - "winreg", + "winreg 0.50.0", ] [[package]] @@ -2777,11 +3117,10 @@ name = "issue1317" version = "3.105.0" dependencies = [ "actix-web", - "env_logger", - "hyper 1.0.0-rc.4", - "log", + "env_logger 0.11.3", + "hyper 1.3.1", "tokio", - "tracing 0.1.37", + "tracing", ] [[package]] @@ -2790,7 +3129,7 @@ version = "3.105.0" dependencies = [ "errno 0.3.9", "libc", - "socket2 0.5.7", + "socket2", ] [[package]] @@ -2798,7 +3137,7 @@ name = "issue1776portnot53" version = "3.105.0" dependencies = [ "libc", - "socket2 0.5.7", + "socket2", ] [[package]] @@ -2819,7 +3158,7 @@ dependencies = [ name = "issue2438" version = "0.1.0" dependencies = [ - "nix 0.24.3", + "nix 0.29.0", ] [[package]] @@ -2831,6 +3170,24 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.11" @@ -2857,10 +3214,11 @@ dependencies = [ [[package]] name = "json-patch" -version = "1.4.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec9ad60d674508f3ca8f380a928cfe7b096bc729c4e2dbfe3852bc45da3ab30b" +checksum = "5b1fb8864823fad91877e6caea0baca82e49e8db50f8e5c9f9a453e27d3330fc" dependencies = [ + "jsonptr", "serde", "serde_json", "thiserror", @@ -2868,10 +3226,12 @@ dependencies = [ [[package]] name = "jsonpath-rust" -version = "0.3.5" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06cc127b7c3d270be504572364f9569761a180b981919dd0d87693a7f5fb7829" +checksum = "19d8fe85bd70ff715f31ce8c739194b423d79811a19602115d611a3ec85d6200" dependencies = [ + "lazy_static", + "once_cell", "pest", "pest_derive", "regex", @@ -2879,6 +3239,17 @@ dependencies = [ "thiserror", ] +[[package]] +name = "jsonptr" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c6e529149475ca0b2820835d3dce8fcc41c6b943ca608d32f35b449255e4627" +dependencies = [ + "fluent-uri", + "serde", + "serde_json", +] + [[package]] name = "jzon" version = "0.12.5" @@ -2887,24 +3258,23 @@ checksum = "17ab85f84ca42c5ec520e6f3c9966ba1fd62909ce260f8837e248857d2560509" [[package]] name = "k8s-cri" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f1ac03a0ee89d53fc350989682a56915a4f93fe7b51801a1066cb3caeb2a23f" +checksum = "311a0cbfd7f4d0a7d2b67ee8665fca40fbe59143c681f5b66e9479885df8854a" dependencies = [ "prost", "serde", "tonic", - "tonic-build 0.8.4", + "tonic-build", ] [[package]] name = "k8s-openapi" -version = "0.20.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc3606fd16aca7989db2f84bb25684d0270c6d6fa1dbcd0025af7b4130523a6" +checksum = "19501afb943ae5806548bc3ebd7f3374153ca057a38f480ef30adfde5ef09755" dependencies = [ - "base64 0.21.7", - "bytes", + "base64 0.22.1", "chrono", "schemars", "serde", @@ -2934,8 +3304,8 @@ dependencies = [ [[package]] name = "kube" -version = "0.87.1" -source = "git+https://github.com/metalbear-co/kube?branch=fix_mb#95a6dc8a4e76c2f3e7829ffefdb154547bbccfa2" +version = "0.91.0" +source = "git+https://github.com/kube-rs/kube?branch=main#0ac1d07d073cc261af767c7f2b9bbf0629fca323" dependencies = [ "k8s-openapi", "kube-client", @@ -2946,55 +3316,55 @@ dependencies = [ [[package]] name = "kube-client" -version = "0.87.1" -source = "git+https://github.com/metalbear-co/kube?branch=fix_mb#95a6dc8a4e76c2f3e7829ffefdb154547bbccfa2" +version = "0.91.0" +source = "git+https://github.com/kube-rs/kube?branch=main#0ac1d07d073cc261af767c7f2b9bbf0629fca323" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "bytes", "chrono", "either", "form_urlencoded", "futures", "home", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.28", - "hyper-proxy", - "hyper-rustls", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.3.1", + "hyper-http-proxy", + "hyper-rustls 0.27.1", "hyper-socks2", - "hyper-timeout", + "hyper-timeout 0.5.1", + "hyper-util", "jsonpath-rust", "k8s-openapi", "kube-core", - "pem 3.0.4", - "pin-project", + "pem", "rand", - "rustls 0.21.12", - "rustls-pemfile 1.0.4", + "rustls 0.23.8", + "rustls-pemfile 2.1.2", "secrecy", "serde", "serde_json", "serde_yaml", "thiserror", "tokio", - "tokio-tungstenite 0.20.1", + "tokio-tungstenite 0.23.0", "tokio-util", "tower", "tower-http", - "tracing 0.1.40", + "tracing", ] [[package]] name = "kube-core" -version = "0.87.1" -source = "git+https://github.com/metalbear-co/kube?branch=fix_mb#95a6dc8a4e76c2f3e7829ffefdb154547bbccfa2" +version = "0.91.0" +source = "git+https://github.com/kube-rs/kube?branch=main#0ac1d07d073cc261af767c7f2b9bbf0629fca323" dependencies = [ "chrono", "form_urlencoded", - "http 0.2.12", + "http 1.1.0", "json-patch", "k8s-openapi", - "once_cell", "schemars", "serde", "serde_json", @@ -3003,39 +3373,41 @@ dependencies = [ [[package]] name = "kube-derive" -version = "0.87.1" -source = "git+https://github.com/metalbear-co/kube?branch=fix_mb#95a6dc8a4e76c2f3e7829ffefdb154547bbccfa2" +version = "0.91.0" +source = "git+https://github.com/kube-rs/kube?branch=main#0ac1d07d073cc261af767c7f2b9bbf0629fca323" dependencies = [ "darling", "proc-macro2", "quote", "serde_json", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] name = "kube-runtime" -version = "0.87.1" -source = "git+https://github.com/metalbear-co/kube?branch=fix_mb#95a6dc8a4e76c2f3e7829ffefdb154547bbccfa2" +version = "0.91.0" +source = "git+https://github.com/kube-rs/kube?branch=main#0ac1d07d073cc261af767c7f2b9bbf0629fca323" dependencies = [ "ahash", + "async-broadcast", + "async-stream", "async-trait", "backoff", "derivative", "futures", "hashbrown 0.14.5", "json-patch", + "jsonptr", "k8s-openapi", "kube-client", "parking_lot", "pin-project", "serde", "serde_json", - "smallvec", "thiserror", "tokio", "tokio-util", - "tracing 0.1.40", + "tracing", ] [[package]] @@ -3061,9 +3433,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.154" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libloading" @@ -3105,9 +3477,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "listen_ports" @@ -3181,12 +3553,6 @@ dependencies = [ "regex-automata 0.1.10", ] -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - [[package]] name = "matchit" version = "0.7.3" @@ -3211,9 +3577,9 @@ dependencies = [ "glob", "rand", "regex", - "syn 2.0.63", + "syn 2.0.66", "thiserror", - "tracing 0.1.40", + "tracing", "tracing-subscriber", ] @@ -3225,33 +3591,32 @@ checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memoffset" -version = "0.6.5" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" dependencies = [ "autocfg", ] [[package]] name = "memoffset" -version = "0.7.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] [[package]] name = "miette" -version = "5.10.0" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e" +checksum = "4edc8853320c2a0dab800fbda86253c8938f6ea88510dc92c5f1ed20e794afc1" dependencies = [ "backtrace", "backtrace-ext", - "is-terminal", + "cfg-if", "miette-derive", - "once_cell", "owo-colors", "supports-color", "supports-hyperlinks", @@ -3264,13 +3629,13 @@ dependencies = [ [[package]] name = "miette-derive" -version = "5.10.0" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" +checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -3307,9 +3672,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" dependencies = [ "adler", ] @@ -3326,6 +3691,12 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "mirai-annotations" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1" + [[package]] name = "mirrord" version = "3.105.0" @@ -3353,22 +3724,22 @@ dependencies = [ "mirrord-progress", "mirrord-protocol", "mirrord-sip", - "nix 0.24.3", + "nix 0.29.0", "prettytable-rs", "rand", "regex", - "reqwest", + "reqwest 0.12.4", "semver 1.0.23", "serde", "serde_json", - "socket2 0.5.7", + "socket2", "thiserror", "tokio", "tokio-util", - "tracing 0.1.40", + "tracing", "tracing-appender", "tracing-subscriber", - "which", + "which 6.0.1", ] [[package]] @@ -3387,17 +3758,18 @@ dependencies = [ "faccess", "fancy-regex", "futures", - "http 0.2.12", + "hickory-resolver", + "http 1.1.0", "http-body-util", "httparse", - "hyper 1.0.0-rc.4", + "hyper 1.3.1", "hyper-util", "iptables", "k8s-cri", "libc", "mirrord-protocol", "mockall", - "nix 0.24.3", + "nix 0.29.0", "num-traits", "oci-spec", "once_cell", @@ -3409,19 +3781,18 @@ dependencies = [ "semver 1.0.23", "serde", "serde_json", - "socket2 0.5.7", + "socket2", "streammap-ext", "test_bin", "thiserror", "tokio", - "tokio-rustls 0.25.0", + "tokio-rustls 0.26.0", "tokio-stream", "tokio-util", "tonic", "tower", - "tracing 0.1.40", + "tracing", "tracing-subscriber", - "trust-dns-resolver", "wildmatch", "x509-parser", ] @@ -3431,13 +3802,13 @@ name = "mirrord-analytics" version = "3.105.0" dependencies = [ "assert-json-diff", - "base64 0.21.7", + "base64 0.22.1", "drain", - "reqwest", + "reqwest 0.12.4", "serde", "serde_json", "tokio", - "tracing 0.1.40", + "tracing", ] [[package]] @@ -3449,15 +3820,16 @@ dependencies = [ "home", "k8s-openapi", "kube", - "pem 2.0.1", - "reqwest", + "pem", + "reqwest 0.12.4", + "ring", "serde", "serde_yaml", "thiserror", "tokio", - "tracing 0.1.40", + "tracing", "whoami", - "x509-certificate 0.19.0", + "x509-certificate", ] [[package]] @@ -3471,15 +3843,15 @@ dependencies = [ "mirrord-analytics", "mirrord-config-derive", "nom", - "rstest 0.17.0", + "rstest", "schemars", "serde", "serde_json", "serde_yaml", "tera", "thiserror", - "toml 0.8.12", - "tracing 0.1.40", + "toml 0.8.13", + "tracing", ] [[package]] @@ -3489,7 +3861,7 @@ dependencies = [ "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -3504,7 +3876,7 @@ dependencies = [ "thiserror", "tokio", "tokio-util", - "tracing 0.1.40", + "tracing", "tracing-subscriber", ] @@ -3514,7 +3886,7 @@ version = "3.105.0" dependencies = [ "bytes", "http-body-util", - "hyper 1.0.0-rc.4", + "hyper 1.3.1", "hyper-util", "mirrord-analytics", "mirrord-config", @@ -3527,7 +3899,7 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "tracing 0.1.40", + "tracing", ] [[package]] @@ -3545,10 +3917,10 @@ name = "mirrord-kube" version = "3.105.0" dependencies = [ "actix-codec", - "base64 0.21.7", + "base64 0.22.1", "futures", - "http-body 0.4.6", - "hyper 0.14.28", + "http-body 1.0.0", + "hyper 1.3.1", "k8s-openapi", "kube", "mirrord-config", @@ -3556,7 +3928,7 @@ dependencies = [ "mirrord-protocol", "rand", "regex", - "rstest 0.17.0", + "rstest", "serde", "serde_json", "shellexpand", @@ -3564,7 +3936,7 @@ dependencies = [ "tokio", "tokio-retry", "tower", - "tracing 0.1.40", + "tracing", ] [[package]] @@ -3573,7 +3945,7 @@ version = "3.105.0" dependencies = [ "actix-codec", "anyhow", - "base64 0.21.7", + "base64 0.22.1", "bimap", "bytemuck", "bytes", @@ -3587,9 +3959,10 @@ dependencies = [ "frida-gum", "futures", "hashbrown 0.14.5", - "http-body 1.0.0-rc.2", - "hyper 1.0.0-rc.4", - "itertools", + "hickory-resolver", + "http-body 1.0.0", + "hyper 1.3.1", + "itertools 0.13.0", "k8s-openapi", "libc", "mirrord-config", @@ -3599,16 +3972,16 @@ dependencies = [ "mirrord-layer-macro", "mirrord-protocol", "mirrord-sip", - "nix 0.24.3", + "nix 0.29.0", "null-terminated", "num-traits", "os_info", "rand", "regex", - "rstest 0.17.0", + "rstest", "serde", "serde_json", - "socket2 0.5.7", + "socket2", "streammap-ext", "syscalls", "test-cdylib", @@ -3617,9 +3990,8 @@ dependencies = [ "tokio", "tokio-stream", "tower", - "tracing 0.1.40", + "tracing", "tracing-subscriber", - "trust-dns-resolver", "urlencoding", ] @@ -3629,7 +4001,7 @@ version = "3.105.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -3639,7 +4011,7 @@ dependencies = [ "proc-macro2", "proc-macro2-diagnostics", "semver 1.0.23", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -3648,12 +4020,12 @@ version = "3.105.0" dependencies = [ "actix-codec", "async-trait", - "base64 0.21.7", + "base64 0.22.1", "bincode", "bytes", "chrono", "futures", - "http 0.2.12", + "http 1.1.0", "k8s-openapi", "kube", "mirrord-analytics", @@ -3663,8 +4035,8 @@ dependencies = [ "mirrord-progress", "mirrord-protocol", "rand", - "reqwest", - "rstest 0.18.2", + "reqwest 0.12.4", + "rstest", "schemars", "semver 1.0.23", "serde", @@ -3672,8 +4044,8 @@ dependencies = [ "serde_yaml", "thiserror", "tokio", - "tokio-tungstenite 0.20.1", - "tracing 0.1.40", + "tokio-tungstenite 0.23.0", + "tracing", ] [[package]] @@ -3694,18 +4066,18 @@ dependencies = [ "bincode", "bytes", "fancy-regex", + "hickory-resolver", "http-body-util", "http-serde", - "hyper 1.0.0-rc.4", + "hyper 1.3.1", "libc", "mirrord-macros", - "nix 0.24.3", + "nix 0.29.0", "semver 1.0.23", "serde", - "socket2 0.5.7", + "socket2", "thiserror", - "tracing 0.1.40", - "trust-dns-resolver", + "tracing", ] [[package]] @@ -3714,19 +4086,19 @@ version = "3.105.0" dependencies = [ "apple-codesign", "memchr", - "object", + "object 0.36.0", "once_cell", "tempfile", "thiserror", - "tracing 0.1.40", - "which", + "tracing", + "which 6.0.1", ] [[package]] name = "mockall" -version = "0.11.4" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c84490118f2ee2d74570d114f3d0493cbf02790df303d2707606c3e14e07c96" +checksum = "43766c2b5203b10de348ffe19f7e54564b64f3d6018ff7648d1e2d6d3a0f0a48" dependencies = [ "cfg-if", "downcast", @@ -3739,56 +4111,57 @@ dependencies = [ [[package]] name = "mockall_derive" -version = "0.11.4" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb" +checksum = "af7cbce79ec385a1d4f54baa90a76401eb15d9cab93685f62e7e9f942aa00ae2" dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.66", ] [[package]] name = "multimap" -version = "0.8.3" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" +checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03" [[package]] name = "nix" -version = "0.24.3" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ "bitflags 1.3.2", "cfg-if", "libc", - "memoffset 0.6.5", + "memoffset 0.7.1", + "pin-utils", ] [[package]] name = "nix" -version = "0.26.4" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "cfg-if", "libc", - "memoffset 0.7.1", - "pin-utils", ] [[package]] name = "nix" -version = "0.27.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ "bitflags 2.5.0", "cfg-if", + "cfg_aliases", "libc", + "memoffset 0.9.1", ] [[package]] @@ -3807,12 +4180,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "normalize-line-endings" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" - [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -3836,9 +4203,9 @@ dependencies = [ [[package]] name = "num" -version = "0.3.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b7a8e9be5e039e2ff869df49155f1c06bd01ade2117ec783e56ab0932b67a8f" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" dependencies = [ "num-complex", "num-integer", @@ -3876,9 +4243,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.3.1" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747d632c0c558b87dbabbe6a82f3b4ae03720d0646ac5b7b4dae89394be5f2c5" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ "num-traits", ] @@ -3891,13 +4258,13 @@ checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" [[package]] name = "num-derive" -version = "0.3.3" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.66", ] [[package]] @@ -3922,11 +4289,10 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.3.2" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ - "autocfg", "num-integer", "num-traits", ] @@ -3968,7 +4334,18 @@ dependencies = [ "hashbrown 0.14.5", "indexmap 2.2.6", "memchr", - "ruzstd", + "ruzstd 0.5.0", +] + +[[package]] +name = "object" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" +dependencies = [ + "flate2", + "memchr", + "ruzstd 0.6.0", ] [[package]] @@ -4052,9 +4429,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "owo-colors" -version = "3.5.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" +checksum = "caff54706df99d2a78a5a4e3455ff45448d81ef1bb63c22cd14052ca0e993a3f" [[package]] name = "p12" @@ -4084,11 +4461,17 @@ dependencies = [ "primeorder", ] +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + [[package]] name = "parking_lot" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -4142,32 +4525,7 @@ dependencies = [ "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 2.0.63", -] - -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - -[[package]] -name = "pem" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" -dependencies = [ - "base64 0.13.1", -] - -[[package]] -name = "pem" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b13fe415cdf3c8e44518e18a7c95a13431d9bdf6d15367d82b23c377fdd441a" -dependencies = [ - "base64 0.21.7", - "serde", + "syn 2.0.66", ] [[package]] @@ -4226,7 +4584,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -4305,7 +4663,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -4375,9 +4733,9 @@ dependencies = [ [[package]] name = "pnet" -version = "0.33.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd959a8268165518e2bf5546ba84c7b3222744435616381df3c456fe8d983576" +checksum = "682396b533413cc2e009fbb48aadf93619a149d3e57defba19ff50ce0201bd0d" dependencies = [ "ipnetwork", "pnet_base", @@ -4389,18 +4747,18 @@ dependencies = [ [[package]] name = "pnet_base" -version = "0.33.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "872e46346144ebf35219ccaa64b1dffacd9c6f188cd7d012bd6977a2a838f42e" +checksum = "ffc190d4067df16af3aba49b3b74c469e611cad6314676eaf1157f31aa0fb2f7" dependencies = [ "no-std-net", ] [[package]] name = "pnet_datalink" -version = "0.33.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c302da22118d2793c312a35fb3da6846cb0fab6c3ad53fd67e37809b06cdafce" +checksum = "e79e70ec0be163102a332e1d2d5586d362ad76b01cec86f830241f2b6452a7b7" dependencies = [ "ipnetwork", "libc", @@ -4411,30 +4769,30 @@ dependencies = [ [[package]] name = "pnet_macros" -version = "0.33.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a780e80005c2e463ec25a6e9f928630049a10b43945fea83207207d4a7606f4" +checksum = "13325ac86ee1a80a480b0bc8e3d30c25d133616112bb16e86f712dcf8a71c863" dependencies = [ "proc-macro2", "quote", "regex", - "syn 1.0.109", + "syn 2.0.66", ] [[package]] name = "pnet_macros_support" -version = "0.33.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d932134f32efd7834eb8b16d42418dac87086347d1bc7d142370ef078582bc" +checksum = "eed67a952585d509dd0003049b1fc56b982ac665c8299b124b90ea2bdb3134ab" dependencies = [ "pnet_base", ] [[package]] name = "pnet_packet" -version = "0.33.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bde678bbd85cb1c2d99dc9fc596e57f03aa725f84f3168b0eaf33eeccb41706" +checksum = "4c96ebadfab635fcc23036ba30a7d33a80c39e8461b8bd7dc7bb186acb96560f" dependencies = [ "glob", "pnet_base", @@ -4444,9 +4802,9 @@ dependencies = [ [[package]] name = "pnet_sys" -version = "0.33.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faf7a58b2803d818a374be9278a1fe8f88fce14b936afbe225000cfcd9c73f16" +checksum = "7d4643d3d4db6b08741050c2f3afa9a892c4244c085a72fcda93c9c2c9a00f4b" dependencies = [ "libc", "winapi", @@ -4454,9 +4812,9 @@ dependencies = [ [[package]] name = "pnet_transport" -version = "0.33.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "813d1c0e4defbe7ee22f6fe1755f122b77bfb5abe77145b1b5baaf463cab9249" +checksum = "5f604d98bc2a6591cf719b58d3203fd882bdd6bf1db696c4ac97978e9f4776bf" dependencies = [ "libc", "pnet_base", @@ -4484,16 +4842,12 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "predicates" -version = "2.1.5" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" +checksum = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8" dependencies = [ - "difflib", - "float-cmp", - "itertools", - "normalize-line-endings", + "anstyle", "predicates-core", - "regex", ] [[package]] @@ -4514,12 +4868,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.1.25" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" +checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" dependencies = [ "proc-macro2", - "syn 1.0.109", + "syn 2.0.66", ] [[package]] @@ -4545,6 +4899,15 @@ dependencies = [ "elliptic-curve", ] +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -4571,9 +4934,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.82" +version = "1.0.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" +checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" dependencies = [ "unicode-ident", ] @@ -4586,16 +4949,16 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", "version_check", "yansi", ] [[package]] name = "prost" -version = "0.11.9" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" +checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ "bytes", "prost-derive", @@ -4603,44 +4966,43 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.11.9" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" +checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" dependencies = [ "bytes", - "heck 0.4.1", - "itertools", - "lazy_static", + "heck 0.5.0", + "itertools 0.12.1", "log", "multimap", + "once_cell", "petgraph", "prettyplease", "prost", "prost-types", "regex", - "syn 1.0.109", + "syn 2.0.66", "tempfile", - "which", ] [[package]] name = "prost-derive" -version = "0.11.9" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" +checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ "anyhow", - "itertools", + "itertools 0.12.1", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.66", ] [[package]] name = "prost-types" -version = "0.11.9" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" +checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" dependencies = [ "prost", ] @@ -4735,7 +5097,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cbaf7105cd254b632f4732fbcc243ce750cef87d8335826125ef6df5733b5a0c" dependencies = [ "either", - "itertools", + "itertools 0.10.5", "proc-macro2", "quote", "rayon", @@ -4752,7 +5114,7 @@ dependencies = [ "ipnetwork", "libc", "nix 0.26.4", - "socket2 0.5.7", + "socket2", "tokio", ] @@ -4787,12 +5149,13 @@ dependencies = [ [[package]] name = "rcgen" -version = "0.10.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" +checksum = "54077e1872c46788540de1ea3d7f4ccb1983d12f9aa909b234468676c1a36779" dependencies = [ - "pem 1.1.1", - "ring 0.16.20", + "pem", + "ring", + "rustls-pki-types", "time", "yasna", ] @@ -4801,7 +5164,7 @@ dependencies = [ name = "recv_from" version = "0.1.0" dependencies = [ - "socket2 0.5.7", + "socket2", ] [[package]] @@ -4865,6 +5228,12 @@ dependencies = [ "regex-syntax 0.8.3", ] +[[package]] +name = "regex-lite" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30b661b2f27137bdbc16f00eda72866a92bb28af1753ffbd56744fb6e2e9cd8e" + [[package]] name = "regex-syntax" version = "0.6.29" @@ -4894,11 +5263,11 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "hyper 0.14.28", - "hyper-rustls", + "hyper-rustls 0.24.2", "ipnet", "js-sys", "log", @@ -4912,18 +5281,62 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper", + "sync_wrapper 0.1.2", "system-configuration", "tokio", "tokio-rustls 0.24.1", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots 0.25.4", + "winreg 0.50.0", +] + +[[package]] +name = "reqwest" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +dependencies = [ + "base64 0.22.1", + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2 0.4.5", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.3.1", + "hyper-rustls 0.26.0", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls 0.22.4", + "rustls-native-certs 0.7.0", + "rustls-pemfile 2.1.2", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper 0.1.2", + "tokio", + "tokio-rustls 0.25.0", "tokio-socks", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots", - "winreg", + "webpki-roots 0.26.1", + "winreg 0.52.0", ] [[package]] @@ -4936,21 +5349,6 @@ dependencies = [ "quick-error", ] -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi", -] - [[package]] name = "ring" version = "0.17.8" @@ -4962,7 +5360,7 @@ dependencies = [ "getrandom", "libc", "spin 0.9.8", - "untrusted 0.9.0", + "untrusted", "windows-sys 0.52.0", ] @@ -4988,56 +5386,31 @@ dependencies = [ [[package]] name = "rstest" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de1bb486a691878cd320c2f0d319ba91eeaa2e894066d8b5f8f117c000e9d962" -dependencies = [ - "futures", - "futures-timer", - "rstest_macros 0.17.0", - "rustc_version", -] - -[[package]] -name = "rstest" -version = "0.18.2" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97eeab2f3c0a199bc4be135c36c924b6590b88c377d416494288c14f2db30199" +checksum = "9afd55a67069d6e434a95161415f5beeada95a01c7b815508a82dcb0e1593682" dependencies = [ "futures", "futures-timer", - "rstest_macros 0.18.2", + "rstest_macros", "rustc_version", ] [[package]] name = "rstest_macros" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290ca1a1c8ca7edb7c3283bd44dc35dd54fdec6253a3912e201ba1072018fca8" -dependencies = [ - "cfg-if", - "proc-macro2", - "quote", - "rustc_version", - "syn 1.0.109", - "unicode-ident", -] - -[[package]] -name = "rstest_macros" -version = "0.18.2" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d428f8247852f894ee1be110b375111b586d4fa431f6c46e64ba5a0dcccbe605" +checksum = "4165dfae59a39dd41d8dec720d3cbfbc71f69744efb480a3920f5d4e0cc6798d" dependencies = [ "cfg-if", "glob", + "proc-macro-crate", "proc-macro2", "quote", "regex", "relative-path", "rustc_version", - "syn 2.0.63", + "syn 2.0.66", "unicode-ident", ] @@ -5066,7 +5439,7 @@ dependencies = [ name = "rust-websockets" version = "0.1.0" dependencies = [ - "axum", + "axum 0.7.5", "tokio", ] @@ -5117,24 +5490,40 @@ dependencies = [ name = "rustls" version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" +dependencies = [ + "log", + "ring", + "rustls-webpki 0.101.7", + "sct", +] + +[[package]] +name = "rustls" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" dependencies = [ "log", - "ring 0.17.8", - "rustls-webpki 0.101.7", - "sct", + "ring", + "rustls-pki-types", + "rustls-webpki 0.102.4", + "subtle", + "zeroize", ] [[package]] name = "rustls" -version = "0.22.4" +version = "0.23.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +checksum = "79adb16721f56eb2d843e67676896a61ce7a0fa622dc18d3e372477a029d2740" dependencies = [ + "aws-lc-rs", "log", - "ring 0.17.8", + "once_cell", + "ring", "rustls-pki-types", - "rustls-webpki 0.102.3", + "rustls-webpki 0.102.4", "subtle", "zeroize", ] @@ -5195,26 +5584,27 @@ version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", + "ring", + "untrusted", ] [[package]] name = "rustls-webpki" -version = "0.102.3" +version = "0.102.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf" +checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" dependencies = [ - "ring 0.17.8", + "aws-lc-rs", + "ring", "rustls-pki-types", - "untrusted 0.9.0", + "untrusted", ] [[package]] name = "rustversion" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "092474d1a01ea8278f69e6a358998405fae5b8b963ddaeb2b0b04a128bf1dfb0" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ruzstd" @@ -5227,6 +5617,17 @@ dependencies = [ "twox-hash", ] +[[package]] +name = "ruzstd" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5174a470eeb535a721ae9fdd6e291c2411a906b96592182d05217591d5c5cf7b" +dependencies = [ + "byteorder", + "derive_more", + "twox-hash", +] + [[package]] name = "ryu" version = "1.0.18" @@ -5247,7 +5648,7 @@ name = "sample-rust" version = "0.1.0" dependencies = [ "libc", - "reqwest", + "reqwest 0.12.4", ] [[package]] @@ -5261,9 +5662,9 @@ dependencies = [ [[package]] name = "schemars" -version = "0.8.19" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc6e7ed6919cb46507fb01ff1654309219f62b4d603822501b0b80d42f6f21ef" +checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" dependencies = [ "chrono", "dyn-clone", @@ -5274,14 +5675,14 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.19" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "185f2b7aa7e02d418e453790dde16890256bbd2bcd04b7dc5348811052b53f49" +checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -5307,7 +5708,7 @@ checksum = "7f81c2fde025af7e69b1d1420531c8a8811ca898919db177141a85313b1cb932" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -5316,8 +5717,8 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", + "ring", + "untrusted", ] [[package]] @@ -5394,9 +5795,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.201" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] @@ -5425,24 +5826,24 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.201" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] name = "serde_derive_internals" -version = "0.29.0" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -5474,14 +5875,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -5500,15 +5901,17 @@ dependencies = [ [[package]] name = "serde_with" -version = "2.3.3" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" +checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" dependencies = [ - "base64 0.13.1", + "base64 0.22.1", "chrono", "hex", "indexmap 1.9.3", + "indexmap 2.2.6", "serde", + "serde_derive", "serde_json", "time", ] @@ -5663,16 +6066,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "socket2" version = "0.5.7" @@ -5732,12 +6125,6 @@ dependencies = [ "tokio-stream", ] -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - [[package]] name = "strsim" version = "0.11.1" @@ -5752,31 +6139,24 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "supports-color" -version = "2.1.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6398cde53adc3c4557306a96ce67b302968513830a77a95b2b17305d9719a89" +checksum = "9829b314621dfc575df4e409e79f9d6a66a3bd707ab73f23cb4aa3a854ac854f" dependencies = [ - "is-terminal", "is_ci", ] [[package]] name = "supports-hyperlinks" -version = "2.1.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f84231692eb0d4d41e4cdd0cabfdd2e6cd9e255e65f80c9aa7c98dd502b4233d" -dependencies = [ - "is-terminal", -] +checksum = "2c0a1e5168041f5f3ff68ff7d95dcb9c8749df29f6e7e89ada40dd4c9de404ee" [[package]] name = "supports-unicode" -version = "2.1.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f850c19edd184a205e883199a261ed44471c81e39bd95b1357f5febbef00e77a" -dependencies = [ - "is-terminal", -] +checksum = "b7401a30af6cb5818bb64852270bb722533397edcfc7344954a38f420819ece2" [[package]] name = "syn" @@ -5791,9 +6171,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.63" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf5be731623ca1a1fb7d8be6f261a3be6d3e2337b8a1f97be944d020c8fcb704" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -5806,6 +6186,12 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" + [[package]] name = "synstructure" version = "0.12.6" @@ -5826,7 +6212,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -5933,12 +6319,12 @@ dependencies = [ [[package]] name = "terminal_size" -version = "0.1.17" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ - "libc", - "winapi", + "rustix", + "windows-sys 0.48.0", ] [[package]] @@ -5976,7 +6362,7 @@ dependencies = [ "futures", "futures-util", "http-body-util", - "hyper 1.0.0-rc.4", + "hyper 1.3.1", "hyper-util", "k8s-openapi", "kube", @@ -5984,22 +6370,22 @@ dependencies = [ "mirrord-operator", "rand", "regex", - "reqwest", - "rstest 0.18.2", + "reqwest 0.12.4", + "rstest", "serde", "serde_json", "tempfile", "tokio", - "tokio-tungstenite 0.19.0", + "tokio-tungstenite 0.23.0", "tokio-util", "wsl", ] [[package]] name = "textwrap" -version = "0.15.2" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7b3e525a49ec206798b40326a44121291b530c963cfb01018f63e135bac543d" +checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" dependencies = [ "smawk", "unicode-linebreak", @@ -6008,22 +6394,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.60" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.60" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -6105,7 +6491,7 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.7", + "socket2", "tokio-macros", "windows-sys 0.48.0", ] @@ -6128,7 +6514,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -6163,6 +6549,17 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls 0.23.8", + "rustls-pki-types", + "tokio", +] + [[package]] name = "tokio-socks" version = "0.5.1" @@ -6188,26 +6585,26 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.19.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec509ac96e9a0c43427c74f003127d953a265737636129424288d27cb5c4b12c" +checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" dependencies = [ "futures-util", "log", "tokio", - "tungstenite 0.19.0", + "tungstenite 0.21.0", ] [[package]] name = "tokio-tungstenite" -version = "0.20.1" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" +checksum = "becd34a233e7e31a3dbf7c7241b38320f57393dcae8e7324b0167d21b8e320b0" dependencies = [ "futures-util", "log", "tokio", - "tungstenite 0.20.1", + "tungstenite 0.23.0", ] [[package]] @@ -6235,55 +6632,65 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.12" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.22.13", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.22.12" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap 2.2.6", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" +checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" dependencies = [ "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.6.8", ] [[package]] name = "tonic" -version = "0.9.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" +checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13" dependencies = [ + "async-stream", "async-trait", - "axum", + "axum 0.6.20", "base64 0.21.7", "bytes", - "futures-core", - "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "hyper 0.14.28", - "hyper-timeout", + "hyper-timeout 0.4.1", "percent-encoding", "pin-project", "prost", @@ -6292,33 +6699,20 @@ dependencies = [ "tower", "tower-layer", "tower-service", - "tracing 0.1.40", -] - -[[package]] -name = "tonic-build" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf5e9b9c0f7e0a7c027dcfaba7b2c60816c7049171f679d99ee2ff65d0de8c4" -dependencies = [ - "prettyplease", - "proc-macro2", - "prost-build", - "quote", - "syn 1.0.109", + "tracing", ] [[package]] name = "tonic-build" -version = "0.9.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6fdaae4c2c638bb70fe42803a26fbd6fc6ac8c72f5c59f67ecc2a2dcabf4b07" +checksum = "be4ef6dd70a610078cb4e338a0f79d06bc759ff1b22d2120c2ff02ae264ba9c2" dependencies = [ "prettyplease", "proc-macro2", "prost-build", "quote", - "syn 1.0.109", + "syn 2.0.66", ] [[package]] @@ -6338,28 +6732,26 @@ dependencies = [ "tokio-util", "tower-layer", "tower-service", - "tracing 0.1.40", + "tracing", ] [[package]] name = "tower-http" -version = "0.4.4" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" +checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" dependencies = [ "base64 0.21.7", "bitflags 2.5.0", "bytes", - "futures-core", - "futures-util", - "http 0.2.12", - "http-body 0.4.6", - "http-range-header", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", "mime", "pin-project-lite", "tower-layer", "tower-service", - "tracing 0.1.40", + "tracing", ] [[package]] @@ -6374,17 +6766,6 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" -[[package]] -name = "tracing" -version = "0.1.37" -source = "git+https://github.com/metalbear-co/tracing?branch=worker_options_non_blocking_v1#bf361d828cd8249290b6445f47963ea4025422bd" -dependencies = [ - "cfg-if", - "pin-project-lite", - "tracing-attributes 0.1.23", - "tracing-core 0.1.30", -] - [[package]] name = "tracing" version = "0.1.40" @@ -6393,8 +6774,8 @@ checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ "log", "pin-project-lite", - "tracing-attributes 0.1.27", - "tracing-core 0.1.32", + "tracing-attributes", + "tracing-core", ] [[package]] @@ -6409,16 +6790,6 @@ dependencies = [ "tracing-subscriber", ] -[[package]] -name = "tracing-attributes" -version = "0.1.23" -source = "git+https://github.com/metalbear-co/tracing?branch=worker_options_non_blocking_v1#bf361d828cd8249290b6445f47963ea4025422bd" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "tracing-attributes" version = "0.1.27" @@ -6427,15 +6798,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", -] - -[[package]] -name = "tracing-core" -version = "0.1.30" -source = "git+https://github.com/metalbear-co/tracing?branch=worker_options_non_blocking_v1#bf361d828cd8249290b6445f47963ea4025422bd" -dependencies = [ - "once_cell", + "syn 2.0.66", ] [[package]] @@ -6456,7 +6819,7 @@ checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" dependencies = [ "log", "once_cell", - "tracing-core 0.1.32", + "tracing-core", ] [[package]] @@ -6466,7 +6829,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" dependencies = [ "serde", - "tracing-core 0.1.32", + "tracing-core", ] [[package]] @@ -6484,59 +6847,12 @@ dependencies = [ "sharded-slab", "smallvec", "thread_local", - "tracing 0.1.40", - "tracing-core 0.1.32", + "tracing", + "tracing-core", "tracing-log", "tracing-serde", ] -[[package]] -name = "trust-dns-proto" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" -dependencies = [ - "async-trait", - "cfg-if", - "data-encoding", - "enum-as-inner", - "futures-channel", - "futures-io", - "futures-util", - "idna 0.2.3", - "ipnet", - "lazy_static", - "rand", - "serde", - "smallvec", - "thiserror", - "tinyvec", - "tokio", - "tracing 0.1.40", - "url", -] - -[[package]] -name = "trust-dns-resolver" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe" -dependencies = [ - "cfg-if", - "futures-util", - "ipconfig", - "lazy_static", - "lru-cache", - "parking_lot", - "resolv-conf", - "serde", - "smallvec", - "thiserror", - "tokio", - "tracing 0.1.40", - "trust-dns-proto", -] - [[package]] name = "try-lock" version = "0.2.5" @@ -6545,36 +6861,20 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tungstenite" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15fba1a6d6bb030745759a9a2a588bfe8490fc8b4751a277db3a0be1c9ebbf67" -dependencies = [ - "byteorder", - "bytes", - "data-encoding", - "http 0.2.12", - "httparse", - "log", - "rand", - "sha1", - "thiserror", - "url", - "utf-8", -] - -[[package]] -name = "tungstenite" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" +checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" dependencies = [ "byteorder", "bytes", "data-encoding", - "http 0.2.12", + "http 1.1.0", "httparse", "log", "rand", + "rustls 0.22.4", + "rustls-native-certs 0.7.0", + "rustls-pki-types", "sha1", "thiserror", "url", @@ -6583,9 +6883,9 @@ dependencies = [ [[package]] name = "tungstenite" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" +checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8" dependencies = [ "byteorder", "bytes", @@ -6594,12 +6894,8 @@ dependencies = [ "httparse", "log", "rand", - "rustls 0.22.4", - "rustls-native-certs 0.7.0", - "rustls-pki-types", "sha1", "thiserror", - "url", "utf-8", ] @@ -6753,12 +7049,6 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - [[package]] name = "untrusted" version = "0.9.0" @@ -6886,7 +7176,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", "wasm-bindgen-shared", ] @@ -6920,7 +7210,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6947,6 +7237,15 @@ version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" +[[package]] +name = "webpki-roots" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "which" version = "4.4.2" @@ -6959,6 +7258,18 @@ dependencies = [ "rustix", ] +[[package]] +name = "which" +version = "6.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8211e4f58a2b2805adfbefbc07bab82958fc91e3836339b1ab7ae32465dce0d7" +dependencies = [ + "either", + "home", + "rustix", + "winsafe", +] + [[package]] name = "whoami" version = "1.5.1" @@ -6978,9 +7289,9 @@ checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" [[package]] name = "wildmatch" -version = "2.3.3" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "939e59c1bc731542357fdaad98b209ef78c8743d652bb61439d16b16a79eb025" +checksum = "3928939971918220fed093266b809d1ee4ec6c1a2d72692ff6876898f3b16c19" [[package]] name = "winapi" @@ -7161,6 +7472,15 @@ version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + [[package]] name = "winnow" version = "0.6.8" @@ -7180,6 +7500,22 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "winsafe" +version = "0.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" + [[package]] name = "wsl" version = "0.1.0" @@ -7205,24 +7541,6 @@ dependencies = [ "cookie-factory", ] -[[package]] -name = "x509-certificate" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf14059fbc1dce14de1d08535c411ba0b18749c2550a12550300da90b7ba350b" -dependencies = [ - "bcder", - "bytes", - "chrono", - "der", - "hex", - "pem 1.1.1", - "ring 0.16.20", - "signature", - "spki", - "thiserror", -] - [[package]] name = "x509-certificate" version = "0.23.1" @@ -7234,8 +7552,8 @@ dependencies = [ "chrono", "der", "hex", - "pem 3.0.4", - "ring 0.17.8", + "pem", + "ring", "signature", "spki", "thiserror", @@ -7326,14 +7644,14 @@ checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" dependencies = [ "zeroize_derive", ] @@ -7346,7 +7664,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index bdca8b320f7..b602184420f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,51 +35,82 @@ authors = ["MetalBear "] description = "Run a local process in the context of a cloud environment" homepage = "https://mirrord.dev" publish = false -keywords = ["cli", "backend", "debug", "test", "kubernetes", "cloud", "native", "local", "ide", "devtool", "developer", "tool"] +keywords = [ + "cli", + "backend", + "debug", + "test", + "kubernetes", + "cloud", + "native", + "local", + "ide", + "devtool", + "developer", + "tool", +] categories = ["development-tools", "backend", "devtool"] [workspace.dependencies] actix-codec = "0.5" -bincode = { version = "2.0.0-rc.2", features = ["serde"] } +bincode = { version = "2.0.0-rc.2", features = ["serde"] } bytes = "1" tokio = { version = "1" } tokio-stream = "0.1" serde = { version = "1", features = ["derive"] } serde_json = "1" anyhow = "1" -nix = { version = "0.24", features = ["net"] } +nix = { version = "0.29", features = ["net"] } clap = { version = "4", features = ["derive"] } tracing = "0.1" tracing-subscriber = { version = "0.3", features = ["env-filter", "json"] } futures = "0.3" thiserror = "1" -k8s-openapi = { version = "0.20", features = ["v1_24"] } -reqwest = { version = "0.11", default-features = false, features = ["blocking", "rustls-tls-native-roots", "json", "socks"] } -kube = { git = "https://github.com/metalbear-co/kube", default-features = false, features = ["runtime", "derive", "client", "ws", "rustls-tls", "oidc", "socks5", "http_proxy"], branch = "fix_mb" } -trust-dns-resolver = { version = "0.22", features = ["serde-config", "tokio-runtime"] } +k8s-openapi = { version = "0.22", features = ["earliest"] } +reqwest = { version = "0.12", default-features = false, features = [ + "blocking", + "rustls-tls-native-roots", + "json", + "socks", + "http2", +] } +kube = { git = "https://github.com/kube-rs/kube", default-features = false, features = [ + "runtime", + "derive", + "client", + "ws", + "rustls-tls", + "oidc", + "socks5", + "http-proxy", +], branch = "main" } +hickory-resolver = { version = "0.24", features = [ + "serde-config", + "tokio-runtime", +] } tokio-util = { version = "0.7", features = ["net", "codec"] } rand = "0.8" streammap-ext = "0.1" num-traits = "0.2" regex = { version = "1", features = ["unicode-case"] } miette = "5" -fancy-regex = { version = "0.10" } +fancy-regex = { version = "0.13" } enum_dispatch = "0.3" -# TODO(alex): hyper 1.0 echosystem update is -# blocked on https://github.com/kube-rs/kube/issues/1351 -hyper = { git = "https://github.com/meowjesty/hyper", branch = "master", features = ["full"] } -hyper-util = { git = "https://github.com/meowjesty/hyper-util", branch = "issue/1869/update-runtime" } -http-body = "1.0.0-rc.2" -http-body-util = "0.1.0-rc.3" + +hyper = { version = "1", features = ["full"] } +hyper-util = { version = "0.1" } +http-body = "1" +http-body-util = "0.1" libc = "0.2" bimap = "0.6.2" -socket2 = { version = "0.5.3", features = ["all"]} -which = "4" +socket2 = { version = "0.5.3", features = ["all"] } +which = "6" semver = "1" once_cell = "1" exec = "0.3" drain = "0.1" +base64 = "0.22" [workspace.lints.rustdoc] private_intra_doc_links = "allow" diff --git a/changelog.d/+dep-update.changed.md b/changelog.d/+dep-update.changed.md new file mode 100644 index 00000000000..c6dd862aba0 --- /dev/null +++ b/changelog.d/+dep-update.changed.md @@ -0,0 +1 @@ +Dependencies update \ No newline at end of file diff --git a/mirrord-schema.json b/mirrord-schema.json index b0dbe522405..bf96d571d9e 100644 --- a/mirrord-schema.json +++ b/mirrord-schema.json @@ -1278,6 +1278,7 @@ }, "path": { "description": " Path is optional so that it can also be specified via env var instead of via conf file, but it is not optional in a resulting [`TargetConfig`] object - either there is a path, or the target configuration is `None`.", + "default": null, "anyOf": [ { "$ref": "#/definitions/Target" diff --git a/mirrord/agent/Cargo.toml b/mirrord/agent/Cargo.toml index 88191b13305..4763f6cb787 100644 --- a/mirrord/agent/Cargo.toml +++ b/mirrord/agent/Cargo.toml @@ -19,12 +19,12 @@ workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -containerd-client = {git = "https://github.com/containerd/rust-extensions", rev="35a97f17d55753bb1ef04c28cd7c3203993932b0"} +containerd-client = "0.5" tokio = { workspace = true, features = ["rt", "net", "macros", "fs", "process", "signal"] } serde.workspace = true serde_json.workspace = true -pnet = "0.33" -nix = { workspace = true, features = ["mount"] } +pnet = "0.35" +nix = { workspace = true, features = ["mount", "sched", "user"] } clap = { workspace = true, features = ["env"] } mirrord-protocol = { path = "../protocol"} actix-codec.workspace = true @@ -33,9 +33,9 @@ tracing.workspace = true tracing-subscriber.workspace = true tokio-stream.workspace = true thiserror.workspace = true -trust-dns-resolver.workspace = true +hickory-resolver.workspace = true num-traits.workspace = true -bollard = "0.14" +bollard = "0.16" tokio-util.workspace = true rand.workspace = true streammap-ext.workspace = true @@ -54,14 +54,14 @@ fancy-regex = { workspace = true } dashmap = { version = "5" } oci-spec = "0.6.0" async-trait = "0.1" -tonic = "0.9" +tonic = "0.11" tower = "0.4" -http = "0.2" -k8s-cri = "0.7" +http = "1" +k8s-cri = "0.8" once_cell.workspace = true semver.workspace = true drain.workspace = true -tokio-rustls = "0.25" +tokio-rustls = "0.26" x509-parser = "0.16" [target.'cfg(target_os = "linux")'.dependencies] @@ -70,6 +70,6 @@ rawsocket = {git = "https://github.com/metalbear-co/rawsocket.git"} [dev-dependencies] -mockall = "0.11.2" # 0.11.3 is broken +mockall = "0.12" # 0.11.3 is broken test_bin = "0.4" -rcgen = "0.10" +rcgen = "0.13" diff --git a/mirrord/agent/src/client_connection.rs b/mirrord/agent/src/client_connection.rs index 9954ce88836..8181e4baabd 100644 --- a/mirrord/agent/src/client_connection.rs +++ b/mirrord/agent/src/client_connection.rs @@ -225,19 +225,19 @@ mod test { #[tokio::test] async fn agent_tls_connector_valid_cert() { let cert = rcgen::generate_simple_self_signed(vec!["operator".to_string()]).unwrap(); - let cert_bytes = cert.serialize_der().unwrap(); - let key_bytes = cert.get_key_pair().serialize_der(); + let cert_bytes = cert.cert.der(); + let key_bytes = cert.key_pair.serialize_der(); let acceptor = ServerConfig::builder() .with_no_client_auth() .with_single_cert( - vec![cert_bytes.into()], + vec![cert_bytes.clone()], PrivateKeyDer::Pkcs8(key_bytes.into()), ) .map(Arc::new) .map(TlsAcceptor::from) .unwrap(); - let connector = AgentTlsConnector::new(cert.serialize_pem().unwrap()).unwrap(); + let connector = AgentTlsConnector::new(cert.cert.pem()).unwrap(); let listener = TcpListener::bind("0.0.0.0:0").await.unwrap(); let addr = listener.local_addr().unwrap(); @@ -270,12 +270,12 @@ mod test { #[tokio::test] async fn agent_tls_connector_invalid_cert() { let server_cert = rcgen::generate_simple_self_signed(vec!["operator".to_string()]).unwrap(); - let server_cert_bytes = server_cert.serialize_der().unwrap(); - let key_bytes = server_cert.get_key_pair().serialize_der(); + let cert_bytes = server_cert.cert.der(); + let key_bytes = server_cert.key_pair.serialize_der(); let acceptor = ServerConfig::builder() .with_no_client_auth() .with_single_cert( - vec![server_cert_bytes.into()], + vec![cert_bytes.clone()], PrivateKeyDer::Pkcs8(key_bytes.into()), ) .map(Arc::new) @@ -290,8 +290,8 @@ mod test { let connector = AgentTlsConnector::new( rcgen::generate_simple_self_signed(vec!["operator".to_string()]) .unwrap() - .serialize_pem() - .unwrap(), + .cert + .pem(), ) .unwrap(); diff --git a/mirrord/agent/src/dns.rs b/mirrord/agent/src/dns.rs index 2aae8167fb5..beff2d94aa3 100644 --- a/mirrord/agent/src/dns.rs +++ b/mirrord/agent/src/dns.rs @@ -1,6 +1,7 @@ use std::{future, path::PathBuf, time::Duration}; use futures::{stream::FuturesOrdered, StreamExt}; +use hickory_resolver::{system_conf::parse_resolv_conf, AsyncResolver, Hosts}; use mirrord_protocol::{ dns::{DnsLookup, GetAddrInfoRequest, GetAddrInfoResponse}, DnsLookupError, RemoteResult, ResolveErrorKindInternal, ResponseError, @@ -13,7 +14,6 @@ use tokio::{ }, }; use tokio_util::sync::CancellationToken; -use trust_dns_resolver::{system_conf::parse_resolv_conf, AsyncResolver, Hosts}; use crate::{ error::{AgentError, Result}, @@ -90,12 +90,12 @@ impl DnsWorker { let (config, mut options) = parse_resolv_conf(resolv_conf)?; options.server_ordering_strategy = - trust_dns_resolver::config::ServerOrderingStrategy::UserProvidedOrder; + hickory_resolver::config::ServerOrderingStrategy::UserProvidedOrder; options.timeout = timeout; options.attempts = attempts; - options.ip_strategy = trust_dns_resolver::config::LookupIpStrategy::Ipv4Only; + options.ip_strategy = hickory_resolver::config::LookupIpStrategy::Ipv4Only; - let mut resolver = AsyncResolver::tokio(config, options)?; + let mut resolver = AsyncResolver::tokio(config, options); let hosts = Hosts::default().read_hosts_conf(hosts_conf.as_slice())?; resolver.set_hosts(Some(hosts)); diff --git a/mirrord/agent/src/namespace.rs b/mirrord/agent/src/namespace.rs index 6eeb7a91bc8..d640134b7f1 100644 --- a/mirrord/agent/src/namespace.rs +++ b/mirrord/agent/src/namespace.rs @@ -1,4 +1,4 @@ -use std::{fs::File, os::fd::AsRawFd}; +use std::fs::File; use nix::sched::{setns, CloneFlags}; use thiserror::Error; @@ -42,6 +42,6 @@ pub(crate) fn set_namespace(pid: u64, namespace_type: NamespaceType) -> Result<( let fd = File::open(namespace_type.path_from_pid(pid))?; // use as_raw_fd to get reference so it will drop after setns - setns(fd.as_raw_fd(), namespace_type.into())?; + setns(fd, namespace_type.into())?; Ok(()) } diff --git a/mirrord/agent/src/sniffer.rs b/mirrord/agent/src/sniffer.rs index edc9e8ba88c..f4fe076bc50 100644 --- a/mirrord/agent/src/sniffer.rs +++ b/mirrord/agent/src/sniffer.rs @@ -99,11 +99,11 @@ struct TCPSession { type TCPSessionMap = HashMap; -const fn is_new_connection(flags: u16) -> bool { +const fn is_new_connection(flags: u8) -> bool { 0 != (flags & TcpFlags::SYN) && 0 == (flags & (TcpFlags::ACK | TcpFlags::RST | TcpFlags::FIN)) } -fn is_closed_connection(flags: u16) -> bool { +fn is_closed_connection(flags: u8) -> bool { 0 != (flags & (TcpFlags::FIN | TcpFlags::RST)) } @@ -172,7 +172,7 @@ async fn prepare_sniffer( #[derive(Debug)] struct TcpPacketData { bytes: Vec, - flags: u16, + flags: u8, } #[tracing::instrument(skip(eth_packet), level = "trace", fields(bytes = %eth_packet.len()))] @@ -514,7 +514,7 @@ impl TcpConnectionSniffer { /// /// tl;dr: checks packet flags, or if it's an HTTP packet, then begins a new sniffing session. #[tracing::instrument(level = "trace", ret, skip(bytes))] - fn treat_as_new_session(tcp_flags: u16, bytes: &[u8]) -> bool { + fn treat_as_new_session(tcp_flags: u8, bytes: &[u8]) -> bool { is_new_connection(tcp_flags) || matches!( HttpVersion::new(bytes), diff --git a/mirrord/agent/src/steal/connections/filtered.rs b/mirrord/agent/src/steal/connections/filtered.rs index 9dcc16b39e9..b3ec9c29656 100644 --- a/mirrord/agent/src/steal/connections/filtered.rs +++ b/mirrord/agent/src/steal/connections/filtered.rs @@ -163,7 +163,7 @@ impl FilteringService { // We need this to progress the connection forward (hyper thing). tokio::spawn(async move { - if let Err(error) = connection.await { + if let Err(error) = connection.with_upgrades().await { tracing::error!(?error, "Connection with original destination failed"); } }); @@ -932,10 +932,10 @@ mod test { accept = original_listener.accept() => { let (stream, _) = accept.unwrap(); let conn = hyper::server::conn::http1::Builder::new() - .serve_connection(TokioIo::new(stream), service_fn(Self::handle_request)); + .serve_connection(TokioIo::new(stream), service_fn(Self::handle_request)).with_upgrades(); tasks.spawn(async move { - conn.with_upgrades() + conn .await .unwrap(); }); @@ -975,7 +975,7 @@ mod test { .unwrap(); tasks.spawn(async move { - conn.await.unwrap(); + conn.with_upgrades().await.unwrap(); }); TestSetup { diff --git a/mirrord/agent/src/steal/http/filter.rs b/mirrord/agent/src/steal/http/filter.rs index 79d04d1a64f..d1a8263f88d 100644 --- a/mirrord/agent/src/steal/http/filter.rs +++ b/mirrord/agent/src/steal/http/filter.rs @@ -74,6 +74,7 @@ impl HttpFilter { /// [`HeaderMap`](hyper::http::header::HeaderMap) entries formatted like `k: v` (format expected by /// [`HttpFilter::Header`]). Computed and cached in [`Request::extensions`] the first time /// [`HttpFilter::matches`] is called on the [`Request`]. +#[derive(Clone)] struct NormalizedHeaders(Vec); impl NormalizedHeaders { diff --git a/mirrord/analytics/Cargo.toml b/mirrord/analytics/Cargo.toml index 11ab9a4c3d2..79bb07c47aa 100644 --- a/mirrord/analytics/Cargo.toml +++ b/mirrord/analytics/Cargo.toml @@ -17,7 +17,7 @@ edition.workspace = true workspace = true [dependencies] -base64 = "0.21" +base64.workspace = true serde.workspace = true reqwest = { workspace = true} tracing.workspace = true diff --git a/mirrord/auth/Cargo.toml b/mirrord/auth/Cargo.toml index eedd515801a..e16113a36d7 100644 --- a/mirrord/auth/Cargo.toml +++ b/mirrord/auth/Cargo.toml @@ -34,15 +34,16 @@ client = [ chrono = "0.4" whoami = { version = "1", optional = true } home = { version = "0.5", optional = true } -pem = "2" -fs4 = { version = "0.6", features = ["tokio-async"], optional = true } +pem = "3" +fs4 = { version = "0.8", features = ["tokio"], optional = true } k8s-openapi = { workspace = true, optional = true } kube = { workspace = true, optional = true } serde = { version = "1", features = ["derive"] } serde_yaml = { version = "0.9", optional = true } tokio = { workspace = true, features = ["fs"], optional = true } thiserror = "1" -x509-certificate = "0.19" +x509-certificate = "0.23" # not direct dependency, but if we don't put it here it'll use openssl :( reqwest = { workspace = true, features=["json", "rustls-tls-native-roots"], default-features = false, optional = true } -tracing.workspace = true \ No newline at end of file +tracing.workspace = true +ring = "0.17" \ No newline at end of file diff --git a/mirrord/auth/src/credentials.rs b/mirrord/auth/src/credentials.rs index 8dc3497796e..7097227ef8d 100644 --- a/mirrord/auth/src/credentials.rs +++ b/mirrord/auth/src/credentials.rs @@ -4,7 +4,7 @@ use chrono::{DateTime, NaiveDate, NaiveTime, Utc}; use serde::{Deserialize, Serialize}; pub use x509_certificate; use x509_certificate::{ - asn1time::Time, rfc2986, rfc5280, InMemorySigningKeyPair, KeyAlgorithm, X509CertificateBuilder, + asn1time::Time, rfc2986, rfc5280, InMemorySigningKeyPair, X509CertificateBuilder, }; use crate::{ @@ -45,7 +45,7 @@ impl Credentials { common_name: &str, key_pair: &InMemorySigningKeyPair, ) -> Result { - let mut builder = X509CertificateBuilder::new(KeyAlgorithm::Ed25519); + let mut builder = X509CertificateBuilder::default(); let _ = builder .subject() @@ -166,6 +166,7 @@ impl DateValidityExt for rfc5280::Validity { #[cfg(feature = "client")] pub mod client { use kube::{api::PostParams, Api, Client, Resource}; + use ring::rand::SystemRandom; use super::*; @@ -185,8 +186,9 @@ pub mod client { let key_pair = match key_pair { Some(key_pair) => key_pair, None => { - let key_algorithm = KeyAlgorithm::Ed25519; - let (_, document) = InMemorySigningKeyPair::generate_random(key_algorithm)?; + let rng = SystemRandom::new(); + let document = ring::signature::Ed25519KeyPair::generate_pkcs8(&rng) + .map_err(|_| AuthenticationError::KeyGenerationError)?; let pem_key = pem::Pem::new("PRIVATE KEY", document.as_ref()); pem::encode(&pem_key).into() } diff --git a/mirrord/auth/src/error.rs b/mirrord/auth/src/error.rs index 7fba159d011..6a3107292bc 100644 --- a/mirrord/auth/src/error.rs +++ b/mirrord/auth/src/error.rs @@ -23,6 +23,10 @@ pub enum AuthenticationError { #[cfg(feature = "client")] #[error(transparent)] Kube(#[from] kube::Error), + + /// Failed to generate key pair + #[error("Failed to generate key pair")] + KeyGenerationError, } /// Error from CredentialStore operations diff --git a/mirrord/cli/Cargo.toml b/mirrord/cli/Cargo.toml index 21c937a3620..4225ad8e1fc 100644 --- a/mirrord/cli/Cargo.toml +++ b/mirrord/cli/Cargo.toml @@ -47,11 +47,11 @@ const-random = "0.1.15" tokio = { workspace = true, features = ["rt", "net", "macros", "process"]} kube.workspace = true k8s-openapi.workspace = true -miette = { version = "5", features = ["fancy"] } +miette = { version = "7", features = ["fancy"] } thiserror.workspace = true prettytable-rs = "0.10" humantime = "2" -nix.workspace = true +nix = {workspace = true, features = ["process", "resource"]} tokio-util.workspace = true socket2.workspace = true drain.workspace = true diff --git a/mirrord/config/Cargo.toml b/mirrord/config/Cargo.toml index 14e21dcf7c8..9bf1a9ec843 100644 --- a/mirrord/config/Cargo.toml +++ b/mirrord/config/Cargo.toml @@ -31,8 +31,8 @@ bimap.workspace = true nom = "7.1" ipnet = "2.8" bitflags = "2" -k8s-openapi = { workspace = true, features = ["schemars"] } +k8s-openapi = { workspace = true, features = ["schemars", "earliest"] } tera = "1" [dev-dependencies] -rstest = "0.17" \ No newline at end of file +rstest = "0.21" \ No newline at end of file diff --git a/mirrord/console/Cargo.toml b/mirrord/console/Cargo.toml index a27ab29c370..3f8c6e2592e 100644 --- a/mirrord/console/Cargo.toml +++ b/mirrord/console/Cargo.toml @@ -30,7 +30,7 @@ mirrord-intproxy-protocol = { path = "../intproxy/protocol", features = ["codec" bincode.workspace = true log = { version = "0.4", features = ["std"] } -miette = "5" +miette = "7" thiserror.workspace = true tokio = { workspace = true, optional = true } diff --git a/mirrord/intproxy/src/proxies/incoming/http.rs b/mirrord/intproxy/src/proxies/incoming/http.rs index 5fd4fb85c5c..34681e52c9a 100644 --- a/mirrord/intproxy/src/proxies/incoming/http.rs +++ b/mirrord/intproxy/src/proxies/incoming/http.rs @@ -43,7 +43,7 @@ pub async fn handshake( _http_v1 => { let (sender, connection) = http1::handshake(TokioIo::new(target_stream)).await?; - tokio::spawn(connection); + tokio::spawn(connection.with_upgrades()); Ok(HttpSender::V1(sender)) } diff --git a/mirrord/kube/Cargo.toml b/mirrord/kube/Cargo.toml index 715d6d89f8b..b36e9cd98d4 100644 --- a/mirrord/kube/Cargo.toml +++ b/mirrord/kube/Cargo.toml @@ -40,8 +40,8 @@ tracing.workspace = true tokio-retry = "0.3" [dev-dependencies] -base64 = "0.21" -http-body = "0.4" -hyper = "0.14" +base64.workspace = true +http-body.workspace = true +hyper = "1" rstest = "*" tower = "0.4" diff --git a/mirrord/layer/Cargo.toml b/mirrord/layer/Cargo.toml index 3c06a8774a8..084ea6ed9f2 100644 --- a/mirrord/layer/Cargo.toml +++ b/mirrord/layer/Cargo.toml @@ -27,18 +27,17 @@ mirrord-intproxy-protocol = { path = "../intproxy/protocol", features = ["codec" ctor = "0.2" libc.workspace = true -nix.workspace = true +nix = { workspace = true, features = ["net", "process", "signal"]} tracing.workspace = true tracing-subscriber.workspace = true -# can't change to upstream since it brings openssl dependency. -frida-gum = { git = "https://github.com/metalbear-co/frida-rust", version = "0.13", features = ["auto-download"], branch="upgrade_frida_capstone" } +frida-gum = { version = "0.13", features = ["auto-download"] } serde.workspace = true serde_json.workspace = true bytes.workspace = true thiserror.workspace = true -trust-dns-resolver.workspace = true +hickory-resolver.workspace = true num-traits.workspace = true rand = "0.8" @@ -49,7 +48,7 @@ socket2.workspace = true anyhow.workspace = true streammap-ext.workspace = true urlencoding = "2" -itertools = "0.10" +itertools = "0.13" os_info = "3" bytemuck = "1" bimap.workspace = true @@ -66,7 +65,7 @@ null-terminated = "0.3" mirrord-intproxy = { path = "../intproxy" } k8s-openapi.workspace = true chrono = { version = "0.4", features = ["clock"] } -base64 = "0.21" +base64.workspace = true http-body = { workspace = true } hyper = { workspace = true } rstest = "*" @@ -74,7 +73,7 @@ test-cdylib = "*" tower = "0.4" tokio = { version = "1", features = ["rt", "net", "macros"] } tests = { path = "../../tests" } -flaky_test = "0.1.0" +flaky_test = "0.2" futures.workspace = true actix-codec.workspace = true tokio-stream.workspace = true diff --git a/mirrord/layer/src/error.rs b/mirrord/layer/src/error.rs index a325b6d71f2..bd7cdb57dc3 100644 --- a/mirrord/layer/src/error.rs +++ b/mirrord/layer/src/error.rs @@ -155,7 +155,7 @@ pub(crate) enum LayerError { NoProcessFound, #[error("mirrord-layer: Regex creation failed with `{0}`.")] - Regex(#[from] fancy_regex::Error), + Regex(#[from] Box), // `From` implemented below, not with `#[from]` so that when new variants of // `SerializationError` are added, they are mapped into different variants of diff --git a/mirrord/layer/src/socket/ops.rs b/mirrord/layer/src/socket/ops.rs index bcb62fb98b5..e959e8d77fe 100644 --- a/mirrord/layer/src/socket/ops.rs +++ b/mirrord/layer/src/socket/ops.rs @@ -4,7 +4,7 @@ use std::{ io, net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, TcpStream}, os::{ - fd::{FromRawFd, IntoRawFd}, + fd::{BorrowedFd, FromRawFd, IntoRawFd}, unix::io::RawFd, }, path::PathBuf, @@ -580,7 +580,9 @@ pub(super) fn connect( if domain != libc::AF_INET && domain != libc::AF_UNIX { return Detour::Bypass(Bypass::Domain(domain)); } - let type_ = nix::sys::socket::getsockopt(sockfd, sockopt::SockType) + // I really hate it, but nix seems to really make this API bad :() + let borrowed_fd = unsafe { BorrowedFd::borrow_raw(sockfd) }; + let type_ = nix::sys::socket::getsockopt(&borrowed_fd, sockopt::SockType) .map_err(io::Error::from)? as i32; let kind = SocketKind::try_from(type_)?; diff --git a/mirrord/layer/tests/apps/issue2438/src/main.rs b/mirrord/layer/tests/apps/issue2438/src/main.rs index af0bbfac855..2d44a9042b1 100644 --- a/mirrord/layer/tests/apps/issue2438/src/main.rs +++ b/mirrord/layer/tests/apps/issue2438/src/main.rs @@ -7,7 +7,7 @@ use std::{ io::{Read, Write}, net::{SocketAddr, TcpStream}, - os::fd::FromRawFd, + os::fd::{AsRawFd, FromRawFd}, }; use nix::sys::socket::{self, AddressFamily, SockFlag, SockType, SockaddrStorage}; @@ -25,15 +25,15 @@ fn main() { None, ) .unwrap(); - println!("SOCKET CREATED: {sockfd}"); + println!("SOCKET CREATED: {sockfd:?}"); - socket::bind(sockfd, &SockaddrStorage::from(bind_address)).unwrap(); + socket::bind(sockfd.as_raw_fd(), &SockaddrStorage::from(bind_address)).unwrap(); println!("SOCKET BOUND TO {bind_address}"); - socket::connect(sockfd, &SockaddrStorage::from(peer_address)).unwrap(); + socket::connect(sockfd.as_raw_fd(), &SockaddrStorage::from(peer_address)).unwrap(); println!("SOCKET CONNECTED TO {peer_address}"); - let mut stream = unsafe { TcpStream::from_raw_fd(sockfd) }; + let mut stream = unsafe { TcpStream::from_raw_fd(sockfd.as_raw_fd()) }; assert_eq!(stream.peer_addr().unwrap(), peer_address); println!("`TcpStream::peer_addr()` RESULT AS EXPECTED"); diff --git a/mirrord/operator/Cargo.toml b/mirrord/operator/Cargo.toml index 868736a0bde..07aa106ab4b 100644 --- a/mirrord/operator/Cargo.toml +++ b/mirrord/operator/Cargo.toml @@ -54,11 +54,11 @@ mirrord-protocol = { path = "../protocol", optional = true } async-trait = "0.1" actix-codec = { workspace = true, optional = true } -base64 = { version = "0.21", optional = true } +base64 = { workspace = true, optional = true } bincode = { version = "2.0.0-rc.2", features = ["serde"], optional = true } bytes = { workspace = true, optional = true } chrono = { version = "0.4", features = ["clock", "serde"] } -http = { version = "0.2", optional = true } +http = { version = "1", optional = true } k8s-openapi = { workspace = true, optional = true } kube = { workspace = true, features = ["derive", "ws"], optional = true } futures = { workspace = true, optional = true } @@ -71,8 +71,8 @@ serde_yaml = { version = "0.9", optional = true } thiserror.workspace = true semver.workspace = true tokio = { workspace = true, optional = true } -tokio-tungstenite = { version = "0.20.1", optional = true } +tokio-tungstenite = { version = "0.23", optional = true } tracing = { workspace = true, optional = true } [dev-dependencies] -rstest = "0.18" +rstest = "0.21" diff --git a/mirrord/protocol/Cargo.toml b/mirrord/protocol/Cargo.toml index e2c3087cb09..49832a7466b 100644 --- a/mirrord/protocol/Cargo.toml +++ b/mirrord/protocol/Cargo.toml @@ -20,12 +20,12 @@ workspace = true actix-codec.workspace = true bytes.workspace = true thiserror.workspace = true -trust-dns-resolver.workspace = true +hickory-resolver.workspace = true serde.workspace = true bincode.workspace = true tracing.workspace = true -hyper = { workspace = true, features = ["client"]} -http-serde = "1.1.2" +hyper = { workspace = true, features = ["client"] } +http-serde = "2" http-body-util = { workspace = true } fancy-regex = { workspace = true } libc.workspace = true @@ -35,4 +35,4 @@ semver = { workspace = true, features = ["serde"] } mirrord-macros = { path = "../macros" } [target.'cfg(target_os = "linux")'.dependencies] -nix.workspace = true +nix = { workspace = true, features = ["fs"] } diff --git a/mirrord/protocol/src/dns.rs b/mirrord/protocol/src/dns.rs index bbb31ceb112..e9f5bd368b3 100644 --- a/mirrord/protocol/src/dns.rs +++ b/mirrord/protocol/src/dns.rs @@ -3,7 +3,7 @@ use core::ops::Deref; use std::net::IpAddr; use bincode::{Decode, Encode}; -use trust_dns_resolver::{lookup_ip::LookupIp, proto::rr::resource::RecordParts}; +use hickory_resolver::{lookup_ip::LookupIp, proto::rr::resource::RecordParts}; use crate::RemoteResult; @@ -29,7 +29,7 @@ impl From for DnsLookup { } = record.into_parts(); rdata - .and_then(|rdata| rdata.to_ip_addr()) + .and_then(|rdata| rdata.ip_addr()) .map(|ip| LookupRecord { name: name_labels.to_string(), ip, diff --git a/mirrord/protocol/src/error.rs b/mirrord/protocol/src/error.rs index 86a5acc1b13..810d8998041 100644 --- a/mirrord/protocol/src/error.rs +++ b/mirrord/protocol/src/error.rs @@ -6,9 +6,9 @@ use std::{ }; use bincode::{Decode, Encode}; +use hickory_resolver::error::{ResolveError, ResolveErrorKind}; use thiserror::Error; use tracing::warn; -use trust_dns_resolver::error::{ResolveError, ResolveErrorKind}; use crate::{ outgoing::SocketAddress, diff --git a/mirrord/protocol/src/tcp.rs b/mirrord/protocol/src/tcp.rs index e6855c0d431..3316f94391f 100644 --- a/mirrord/protocol/src/tcp.rs +++ b/mirrord/protocol/src/tcp.rs @@ -81,7 +81,7 @@ pub enum DaemonTcp { pub struct Filter(String); impl Filter { - pub fn new(filter_str: String) -> Result { + pub fn new(filter_str: String) -> Result> { let _ = fancy_regex::Regex::new(&filter_str).inspect_err(|fail| { error!( r" diff --git a/mirrord/sip/Cargo.toml b/mirrord/sip/Cargo.toml index be868cbfcf1..e67eb3f2778 100644 --- a/mirrord/sip/Cargo.toml +++ b/mirrord/sip/Cargo.toml @@ -19,7 +19,7 @@ workspace = true [dependencies] apple-codesign = { version = "0.27", default-features = false} memchr = "2" -object = "0.32" +object = "0.36" tempfile = "3" once_cell.workspace = true diff --git a/mirrord/sip/src/lib.rs b/mirrord/sip/src/lib.rs index ad30278e325..9f78f5a49f0 100644 --- a/mirrord/sip/src/lib.rs +++ b/mirrord/sip/src/lib.rs @@ -18,8 +18,11 @@ mod main { use apple_codesign::{CodeSignatureFlags, MachFile}; use object::{ - macho::{self, FatHeader, MachHeader64, LC_RPATH}, - read::macho::{FatArch, LoadCommandVariant::Rpath, MachHeader}, + macho::{self, MachHeader64, LC_RPATH}, + read::{ + self, + macho::{FatArch, LoadCommandVariant::Rpath, MachHeader}, + }, Architecture, Endianness, FileKind, }; use once_cell::sync::Lazy; @@ -146,17 +149,18 @@ mod main { // This is probably where most fat binaries are handled (see comment above // `MachOFat64`). A 32 bit archive (fat Mach-O) can contain 64 bit binaries. FileKind::MachOFat32 => { - let fat_slice = FatHeader::parse_arch32(bytes).map_err(|_| { + let fat_slice = read::macho::MachOFatFile32::parse(bytes).map_err(|_| { SipError::UnsupportedFileFormat("FatMach-O 32-bit".to_string()) })?; #[cfg(target_arch = "aarch64")] let found_arch = fat_slice + .arches() .iter() .find(is_fat_arm64_arch) - .or_else(|| fat_slice.iter().find(is_fat_x64_arch)); + .or_else(|| fat_slice.arches().iter().find(is_fat_x64_arch)); #[cfg(target_arch = "x86_64")] - let found_arch = fat_slice.iter().find(is_fat_x64_arch); + let found_arch = fat_slice.arches().iter().find(is_fat_x64_arch); found_arch .map(|arch| Self::new(arch.offset() as usize, arch.size() as usize)) @@ -167,18 +171,19 @@ mod main { // binaries has 2^32 bytes or more (around 4 GB). // See https://github.com/Homebrew/ruby-macho/issues/101#issuecomment-403202114 FileKind::MachOFat64 => { - let fat_slice = FatHeader::parse_arch64(bytes).map_err(|_| { + let fat_slice = read::macho::MachOFatFile64::parse(bytes).map_err(|_| { SipError::UnsupportedFileFormat("Mach-O 32-bit".to_string()) })?; #[cfg(target_arch = "aarch64")] let found_arch = fat_slice + .arches() .iter() .find(is_fat_arm64_arch) - .or_else(|| fat_slice.iter().find(is_fat_x64_arch)); + .or_else(|| fat_slice.arches().iter().find(is_fat_x64_arch)); #[cfg(target_arch = "x86_64")] - let found_arch = fat_slice.iter().find(is_fat_x64_arch); + let found_arch = fat_slice.arches().iter().find(is_fat_x64_arch); found_arch .map(|arch| Self::new(arch.offset() as usize, arch.size() as usize)) diff --git a/sample/rust/Cargo.toml b/sample/rust/Cargo.toml index 65cc24aabb2..c4b90967fda 100644 --- a/sample/rust/Cargo.toml +++ b/sample/rust/Cargo.toml @@ -10,4 +10,4 @@ workspace = true [dependencies] libc = "0.2" -reqwest = { version = "0.11", default-features = false, features = ["blocking", "rustls-tls"]} \ No newline at end of file +reqwest = { version = "0.12", default-features = false, features = ["blocking", "rustls-tls"]} \ No newline at end of file diff --git a/tests/Cargo.toml b/tests/Cargo.toml index fae97a05c27..7925b0661a6 100644 --- a/tests/Cargo.toml +++ b/tests/Cargo.toml @@ -20,7 +20,7 @@ mirrord = { artifact = "bin", path = "../mirrord/cli" } mirrord-operator = { path = "../mirrord/operator" } serde = "1" futures.workspace = true -rstest = "0.18" +rstest = "0.21" tokio-util = "0.7" rand = "0.8" futures-util = "0.3" @@ -28,7 +28,7 @@ wsl = "0.1" chrono = "0.4" tempfile = "3" bytes = "1" -tokio-tungstenite = { version = "0.19" } +tokio-tungstenite = { version = "0.23" } fancy-regex.workspace = true hyper.workspace = true hyper-util.workspace = true diff --git a/tests/issue1317/Cargo.toml b/tests/issue1317/Cargo.toml index 5f74c1d8e6e..c6a2f5cc9d3 100644 --- a/tests/issue1317/Cargo.toml +++ b/tests/issue1317/Cargo.toml @@ -20,8 +20,7 @@ workspace = true [dependencies] tokio = { version = "1", features = ["rt", "rt-multi-thread", "net", "macros", "process"] } -hyper = { git = "https://github.com/meowjesty/hyper", branch = "master", features = ["full"] } -tracing = { git = "https://github.com/metalbear-co/tracing", package = "tracing", branch = "worker_options_non_blocking_v1" } +hyper = { version = "1", features = ["full"] } +tracing = "0.1" actix-web = "4" -log = "0.4" -env_logger = "0.10" +env_logger = "0.11" diff --git a/tests/rust-websockets/Cargo.toml b/tests/rust-websockets/Cargo.toml index 19bbb8bd989..1c9d82abe88 100644 --- a/tests/rust-websockets/Cargo.toml +++ b/tests/rust-websockets/Cargo.toml @@ -9,5 +9,5 @@ workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -axum = { version = "0.6", features = ["ws"] } +axum = { version = "0.7", features = ["ws"] } tokio = { version = "1", features = ["rt", "macros"]} diff --git a/tests/rust-websockets/src/main.rs b/tests/rust-websockets/src/main.rs index 13dbff5b93a..dcf26975fbe 100644 --- a/tests/rust-websockets/src/main.rs +++ b/tests/rust-websockets/src/main.rs @@ -1,9 +1,6 @@ //! Test app that opens an HTTP server at port `80`. It accepts WebSockets connections on the root //! path and echoes all [`Message::Text`] and [`Message::Binary`] messages. The app exists //! successfully after any WebSockets connection closes. - -use std::net::SocketAddr; - use axum::{ extract::{ ws::{Message, WebSocket, WebSocketUpgrade}, @@ -12,12 +9,10 @@ use axum::{ routing::get, Router, }; -use tokio::sync::mpsc; +use tokio::{net::TcpListener, sync::mpsc}; #[tokio::main(flavor = "current_thread")] async fn main() { - let addr: SocketAddr = "0.0.0.0:80".parse().unwrap(); - let (shutdown_tx, mut shutdown_rx) = mpsc::unbounded_channel::<()>(); let app = Router::new() @@ -31,8 +26,8 @@ async fn main() { ) .with_state(shutdown_tx); - axum::Server::bind(&addr) - .serve(app.into_make_service()) + let listener = TcpListener::bind("0.0.0.0:80").await.unwrap(); + axum::serve(listener, app) .with_graceful_shutdown(async move { shutdown_rx.recv().await; }) @@ -43,7 +38,10 @@ async fn main() { async fn handle_socket(mut socket: WebSocket, shutdown: mpsc::UnboundedSender<()>) { loop { let msg = match socket.recv().await { - Some(Ok(msg)) => msg, + Some(Ok(msg)) => { + eprintln!("Receieved Message: {msg:?}"); + msg + } Some(Err(err)) => { eprintln!("Error while receiving message: {err:?}"); break;