diff --git a/Cargo.lock b/Cargo.lock index bf34a70539071..88d323a6b5089 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -805,7 +805,7 @@ dependencies = [ "rand", "regex", "ring 0.17.5", - "rustls", + "rustls 0.21.8", "rustls-native-certs 0.6.3", "rustls-pemfile 1.0.4", "rustls-webpki 0.101.7", @@ -817,7 +817,7 @@ dependencies = [ "time", "tokio", "tokio-retry", - "tokio-rustls", + "tokio-rustls 0.24.1", "tracing", "url", ] @@ -995,7 +995,7 @@ dependencies = [ "bytes", "fastrand 2.0.1", "http 0.2.9", - "hyper", + "hyper 0.14.27", "time", "tokio", "tracing", @@ -1024,11 +1024,37 @@ dependencies = [ "aws-types", "bytes", "http 0.2.9", - "http-body", + "http-body 0.4.5", "pin-project-lite", "tracing", ] +[[package]] +name = "aws-lc-rs" +version = "1.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df33e4a55b03f8780ba55041bc7be91a2a8ec8c03517b0379d2d6c96d2c30d95" +dependencies = [ + "aws-lc-sys", + "mirai-annotations", + "paste", + "zeroize", +] + +[[package]] +name = "aws-lc-sys" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37ede3d6e360a48436fee127cb81710834407b1ec0c48a001cc29dec9005f73e" +dependencies = [ + "bindgen 0.69.4", + "cmake", + "dunce", + "fs_extra", + "libc", + "paste", +] + [[package]] name = "aws-runtime" version = "1.0.1" @@ -1095,7 +1121,7 @@ dependencies = [ "aws-types", "bytes", "http 0.2.9", - "http-body", + "http-body 0.4.5", "once_cell", "percent-encoding", "regex", @@ -1178,7 +1204,7 @@ dependencies = [ "crc32fast", "hex", "http 0.2.9", - "http-body", + "http-body 0.4.5", "md-5", "pin-project-lite", "sha1", @@ -1210,7 +1236,7 @@ dependencies = [ "bytes-utils", "futures-core", "http 0.2.9", - "http-body", + "http-body 0.4.5", "once_cell", "percent-encoding", "pin-project-lite", @@ -1250,13 +1276,13 @@ dependencies = [ "bytes", "fastrand 2.0.1", "http 0.2.9", - "http-body", - "hyper", - "hyper-rustls", + "http-body 0.4.5", + "hyper 0.14.27", + "hyper-rustls 0.24.2", "once_cell", "pin-project-lite", "pin-utils", - "rustls", + "rustls 0.21.8", "tokio", "tracing", ] @@ -1287,8 +1313,8 @@ dependencies = [ "bytes-utils", "futures-core", "http 0.2.9", - "http-body", - "hyper", + "http-body 0.4.5", + "hyper 0.14.27", "itoa", "num-integer", "pin-project-lite", @@ -1346,8 +1372,8 @@ dependencies = [ "bytes", "futures-util", "http 0.2.9", - "http-body", - "hyper", + "http-body 0.4.5", + "hyper 0.14.27", "itoa", "matchit", "memchr", @@ -1376,7 +1402,7 @@ dependencies = [ "bytes", "futures-util", "http 0.2.9", - "http-body", + "http-body 0.4.5", "mime", "rustversion", "tower-layer", @@ -1569,6 +1595,29 @@ dependencies = [ "shlex", ] +[[package]] +name = "bindgen" +version = "0.69.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +dependencies = [ + "bitflags 2.5.0", + "cexpr", + "clang-sys", + "itertools 0.12.0", + "lazy_static", + "lazycell", + "log", + "prettyplease 0.2.15", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.48", + "which", +] + [[package]] name = "bit-set" version = "0.5.3" @@ -2140,7 +2189,7 @@ dependencies = [ "clickhouse-derive", "clickhouse-rs-cityhash-sys", "futures", - "hyper", + "hyper 0.14.27", "hyper-tls", "lz4", "sealed", @@ -3530,6 +3579,12 @@ dependencies = [ "shared_child", ] +[[package]] +name = "dunce" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" + [[package]] name = "duration-str" version = "0.7.0" @@ -4354,6 +4409,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "fs_extra" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" + [[package]] name = "function_name" version = "0.3.0" @@ -4560,8 +4621,8 @@ dependencies = [ "async-stream", "async-trait", "dyn-clone", - "hyper", - "hyper-rustls", + "hyper 0.14.27", + "hyper-rustls 0.24.2", "log", "reqwest", "serde", @@ -4998,6 +5059,16 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.0.0", +] + [[package]] name = "http-range-header" version = "0.3.1" @@ -5034,7 +5105,7 @@ dependencies = [ "futures-util", "h2", "http 0.2.9", - "http-body", + "http-body 0.4.5", "httparse", "httpdate", "itoa", @@ -5046,6 +5117,25 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "httparse", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + [[package]] name = "hyper-rustls" version = "0.24.2" @@ -5054,13 +5144,32 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http 0.2.9", - "hyper", + "hyper 0.14.27", "log", - "rustls", + "rustls 0.21.8", "rustls-native-certs 0.6.3", "tokio", - "tokio-rustls", - "webpki-roots", + "tokio-rustls 0.24.1", +] + +[[package]] +name = "hyper-rustls" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "736f15a50e749d033164c56c09783b6102c4ff8da79ad77dbddbbaea0f8567f7" +dependencies = [ + "futures-util", + "http 1.0.0", + "hyper 1.2.0", + "hyper-util", + "log", + "rustls 0.23.4", + "rustls-native-certs 0.7.0", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.26.0", + "tower-service", + "webpki-roots 0.26.1", ] [[package]] @@ -5069,7 +5178,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "hyper", + "hyper 0.14.27", "pin-project-lite", "tokio", "tokio-io-timeout", @@ -5082,12 +5191,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper", + "hyper 0.14.27", "native-tls", "tokio", "tokio-native-tls", ] +[[package]] +name = "hyper-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "hyper 1.2.0", + "pin-project-lite", + "socket2 0.5.6", + "tokio", + "tower", + "tower-service", + "tracing", +] + [[package]] name = "hytra" version = "0.1.2" @@ -6214,6 +6343,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 = "mockall" version = "0.11.4" @@ -6352,7 +6487,7 @@ checksum = "8a60cb978c0a1d654edcc1460f8d6092dacf21346ed6017d81fb76a23ef5a8de" dependencies = [ "base64 0.21.7", "bigdecimal 0.4.2", - "bindgen", + "bindgen 0.59.2", "bitflags 2.5.0", "bitvec", "btoi", @@ -6735,7 +6870,7 @@ dependencies = [ "chrono", "futures", "humantime", - "hyper", + "hyper 0.14.27", "itertools 0.11.0", "parking_lot 0.12.1", "percent-encoding", @@ -8594,9 +8729,9 @@ dependencies = [ "futures-util", "h2", "http 0.2.9", - "http-body", - "hyper", - "hyper-rustls", + "http-body 0.4.5", + "hyper 0.14.27", + "hyper-rustls 0.24.2", "hyper-tls", "ipnet", "js-sys", @@ -8606,7 +8741,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls", + "rustls 0.21.8", "rustls-native-certs 0.6.3", "rustls-pemfile 1.0.4", "serde", @@ -8614,7 +8749,7 @@ dependencies = [ "serde_urlencoded", "tokio", "tokio-native-tls", - "tokio-rustls", + "tokio-rustls 0.24.1", "tokio-util", "tower-service", "url", @@ -8622,7 +8757,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots", + "webpki-roots 0.25.2", "winreg", ] @@ -8964,7 +9099,7 @@ dependencies = [ "governor", "hex", "http 0.2.9", - "http-body", + "http-body 0.4.5", "humantime", "hytra", "itertools 0.12.0", @@ -9074,8 +9209,8 @@ dependencies = [ "easy-ext", "futures", "http 0.2.9", - "http-body", - "hyper", + "http-body 0.4.5", + "hyper 0.14.27", "hytra", "itertools 0.12.0", "libc", @@ -9114,7 +9249,7 @@ version = "1.7.0-alpha" dependencies = [ "async-trait", "futures", - "hyper", + "hyper 0.14.27", "madsim-tokio", "madsim-tonic", "prometheus", @@ -9193,7 +9328,7 @@ dependencies = [ "foyer", "futures", "futures-async-stream", - "hyper", + "hyper 0.14.27", "itertools 0.12.0", "madsim-tokio", "madsim-tonic", @@ -9267,7 +9402,7 @@ dependencies = [ "glob", "google-cloud-pubsub", "http 0.2.9", - "hyper", + "hyper 0.14.27", "hyper-tls", "icelake", "indexmap 1.9.3", @@ -9327,7 +9462,7 @@ dependencies = [ "time", "tokio-postgres", "tokio-retry", - "tokio-rustls", + "tokio-rustls 0.24.1", "tokio-stream", "tokio-util", "tracing", @@ -9781,7 +9916,7 @@ dependencies = [ "function_name", "futures", "hex", - "hyper", + "hyper 0.14.27", "itertools 0.12.0", "madsim-etcd-client", "madsim-tokio", @@ -9840,7 +9975,7 @@ dependencies = [ "bytes", "cargo-emit", "dircpy", - "hyper", + "hyper 0.14.27", "mime_guess", "npm_rs", "reqwest", @@ -9949,8 +10084,8 @@ dependencies = [ "either", "fail", "futures", - "hyper", - "hyper-rustls", + "hyper 0.14.27", + "hyper-rustls 0.27.0", "hyper-tls", "itertools 0.12.0", "madsim", @@ -9959,7 +10094,7 @@ dependencies = [ "opendal", "prometheus", "risingwave_common", - "rustls", + "rustls 0.21.8", "spin 0.9.8", "thiserror", "thiserror-ext", @@ -10033,7 +10168,7 @@ dependencies = [ "either", "futures", "http 0.2.9", - "hyper", + "hyper 0.14.27", "itertools 0.12.0", "lru 0.7.6", "madsim-tokio", @@ -10505,7 +10640,7 @@ dependencies = [ "rustls-webpki 0.100.3", "thiserror", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", "url", ] @@ -10648,6 +10783,21 @@ dependencies = [ "sct", ] +[[package]] +name = "rustls" +version = "0.23.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c4d6d8ad9f2492485e13453acbb291dd08f64441b6609c491f1c2cd2c6b4fe1" +dependencies = [ + "aws-lc-rs", + "log", + "once_cell", + "rustls-pki-types", + "rustls-webpki 0.102.2", + "subtle", + "zeroize", +] + [[package]] name = "rustls-native-certs" version = "0.6.3" @@ -10718,6 +10868,18 @@ dependencies = [ "untrusted 0.9.0", ] +[[package]] +name = "rustls-webpki" +version = "0.102.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +dependencies = [ + "aws-lc-rs", + "ring 0.17.5", + "rustls-pki-types", + "untrusted 0.9.0", +] + [[package]] name = "rustversion" version = "1.0.14" @@ -12562,7 +12724,18 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls", + "rustls 0.21.8", + "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.4", + "rustls-pki-types", "tokio", ] @@ -12683,8 +12856,8 @@ dependencies = [ "futures-util", "h2", "http 0.2.9", - "http-body", - "hyper", + "http-body 0.4.5", + "hyper 0.14.27", "hyper-timeout", "percent-encoding", "pin-project", @@ -12711,22 +12884,22 @@ dependencies = [ "flate2", "h2", "http 0.2.9", - "http-body", - "hyper", + "http-body 0.4.5", + "hyper 0.14.27", "hyper-timeout", "percent-encoding", "pin-project", "prost 0.12.1", - "rustls", + "rustls 0.21.8", "rustls-pemfile 1.0.4", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", "tokio-stream", "tower", "tower-layer", "tower-service", "tracing", - "webpki-roots", + "webpki-roots 0.25.2", ] [[package]] @@ -12774,7 +12947,7 @@ dependencies = [ "futures-core", "futures-util", "http 0.2.9", - "http-body", + "http-body 0.4.5", "http-range-header", "httpdate", "mime", @@ -13779,6 +13952,15 @@ version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" +[[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" @@ -14256,7 +14438,7 @@ dependencies = [ "hashbrown 0.13.2", "hashbrown 0.14.3", "hmac", - "hyper", + "hyper 0.14.27", "indexmap 1.9.3", "indexmap 2.0.0", "itertools 0.11.0", @@ -14414,12 +14596,12 @@ dependencies = [ "base64 0.13.1", "futures", "http 0.2.9", - "hyper", - "hyper-rustls", + "hyper 0.14.27", + "hyper-rustls 0.24.2", "itertools 0.10.5", "log", "percent-encoding", - "rustls", + "rustls 0.21.8", "rustls-pemfile 1.0.4", "seahash", "serde", diff --git a/src/object_store/Cargo.toml b/src/object_store/Cargo.toml index 75c8dabd65898..29192e70ae8a1 100644 --- a/src/object_store/Cargo.toml +++ b/src/object_store/Cargo.toml @@ -23,7 +23,7 @@ either = "1" fail = "0.5" futures = { version = "0.3", default-features = false, features = ["alloc"] } hyper = { version = "0.14", features = ["tcp", "client"] } -hyper-rustls = { version = "0.24.2", features = ["webpki-roots"] } +hyper-rustls = { version = "0.27.0", features = ["webpki-roots"] } hyper-tls = "0.5.0" itertools = "0.12" madsim = "0.2.22"