From 2bc409e5ec2373bc56748e1a9cc38d7cea445bae Mon Sep 17 00:00:00 2001 From: Wez Furlong Date: Tue, 26 Mar 2024 06:47:56 -0700 Subject: [PATCH] deps: reqwest -> 0.12 closes: https://github.com/KumoCorp/kumomta/pull/160 --- Cargo.lock | 247 ++++++++++++++++++++++++++++++++++++++++++++--------- Cargo.toml | 2 +- 2 files changed, 210 insertions(+), 39 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d5602c8e..b60a127a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -398,8 +398,8 @@ dependencies = [ "bytes", "futures-util", "http 0.2.12", - "http-body", - "hyper", + "http-body 0.4.6", + "hyper 0.14.28", "itoa", "matchit", "memchr", @@ -441,7 +441,7 @@ dependencies = [ "bytes", "futures-util", "http 0.2.12", - "http-body", + "http-body 0.4.6", "mime", "rustversion", "tower-layer", @@ -458,13 +458,13 @@ dependencies = [ "bytes", "futures-util", "http 0.2.12", - "http-body", - "hyper", + "http-body 0.4.6", + "hyper 0.14.28", "pin-project-lite", - "rustls", + "rustls 0.21.10", "rustls-pemfile", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", "tower-service", ] @@ -2142,6 +2142,29 @@ 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.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +dependencies = [ + "bytes", + "futures-core", + "http 1.1.0", + "http-body 1.0.0", + "pin-project-lite", +] + [[package]] name = "http-range-header" version = "0.3.1" @@ -2193,7 +2216,7 @@ dependencies = [ "futures-util", "h2", "http 0.2.12", - "http-body", + "http-body 0.4.6", "httparse", "httpdate", "itoa", @@ -2205,6 +2228,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.1.0", + "http-body 1.0.0", + "httparse", + "itoa", + "pin-project-lite", + "smallvec 1.13.2", + "tokio", + "want", +] + [[package]] name = "hyper-rustls" version = "0.24.2" @@ -2213,10 +2255,27 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http 0.2.12", - "hyper", - "rustls", + "hyper 0.14.28", + "rustls 0.21.10", "tokio", - "tokio-rustls", + "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.2.0", + "hyper-util", + "rustls 0.22.3", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.25.0", + "tower-service", ] [[package]] @@ -2225,12 +2284,32 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "hyper", + "hyper 0.14.28", "pin-project-lite", "tokio", "tokio-io-timeout", ] +[[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.1.0", + "http-body 1.0.0", + "hyper 1.2.0", + "pin-project-lite", + "socket2 0.5.6", + "tokio", + "tower", + "tower-service", + "tracing", +] + [[package]] name = "iana-time-zone" version = "0.1.60" @@ -2511,7 +2590,7 @@ dependencies = [ "kumo-api-types", "lexicmp", "message", - "reqwest", + "reqwest 0.12.2", "serde", "serde_json", "tabout", @@ -2557,7 +2636,7 @@ dependencies = [ "kumo-log-types", "mlua", "mod-memoize", - "reqwest", + "reqwest 0.12.2", "rfc5321", "serde", "serde_json", @@ -2667,7 +2746,7 @@ dependencies = [ "prometheus", "rcgen", "regex-set-map", - "rustls", + "rustls 0.21.10", "rustls-pemfile", "serde", "serde_json", @@ -2774,7 +2853,7 @@ dependencies = [ "prometheus", "rand", "rfc5321", - "rustls", + "rustls 0.21.10", "self_cell", "serde", "serde_json", @@ -2785,12 +2864,12 @@ dependencies = [ "throttle", "timeq", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", "tracing", "utoipa", "uuid", "version-info", - "webpki-roots", + "webpki-roots 0.25.4", "zstd", ] @@ -3427,7 +3506,7 @@ dependencies = [ "mail-builder", "mailparse", "mlua", - "reqwest", + "reqwest 0.12.2", "serde", ] @@ -3497,7 +3576,7 @@ dependencies = [ "k9 0.12.0", "lruttl", "once_cell", - "reqwest", + "reqwest 0.12.2", "tokio", ] @@ -4649,9 +4728,9 @@ dependencies = [ "futures-util", "h2", "http 0.2.12", - "http-body", - "hyper", - "hyper-rustls", + "http-body 0.4.6", + "hyper 0.14.28", + "hyper-rustls 0.24.2", "ipnet", "js-sys", "log", @@ -4659,7 +4738,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls", + "rustls 0.21.10", "rustls-pemfile", "serde", "serde_json", @@ -4667,13 +4746,54 @@ dependencies = [ "sync_wrapper", "system-configuration", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots", + "webpki-roots 0.25.4", + "winreg", +] + +[[package]] +name = "reqwest" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d66674f2b6fb864665eea7a3c1ac4e3dfacd2fda83cf6f935a612e01b0e3338" +dependencies = [ + "base64 0.21.7", + "bytes", + "futures-core", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.2.0", + "hyper-rustls 0.26.0", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls 0.22.3", + "rustls-pemfile", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tokio-rustls 0.25.0", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots 0.26.1", "winreg", ] @@ -4703,9 +4823,9 @@ dependencies = [ "thiserror", "tokio", "tokio-openssl", - "tokio-rustls", + "tokio-rustls 0.24.1", "tracing", - "webpki-roots", + "webpki-roots 0.25.4", ] [[package]] @@ -4799,7 +4919,7 @@ dependencies = [ "async-trait", "bytes", "http 0.2.12", - "reqwest", + "reqwest 0.11.27", "rustify_derive", "serde", "serde_json", @@ -4858,10 +4978,24 @@ checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", "ring 0.17.8", - "rustls-webpki", + "rustls-webpki 0.101.7", "sct", ] +[[package]] +name = "rustls" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99008d7ad0bbbea527ec27bddbc0e432c5b87d8175178cee68d2eec9c4a1813c" +dependencies = [ + "log", + "ring 0.17.8", + "rustls-pki-types", + "rustls-webpki 0.102.2", + "subtle", + "zeroize", +] + [[package]] name = "rustls-connector" version = "0.18.5" @@ -4869,9 +5003,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25da151615461c7347114b1ad1a7458b4cdebc69cb220cd140cd5cb324b1dd37" dependencies = [ "log", - "rustls", + "rustls 0.21.10", "rustls-native-certs", - "rustls-webpki", + "rustls-webpki 0.101.7", ] [[package]] @@ -4895,6 +5029,12 @@ dependencies = [ "base64 0.21.7", ] +[[package]] +name = "rustls-pki-types" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "868e20fada228fefaf6b652e00cc73623d54f8171e7352c18bb281571f2d92da" + [[package]] name = "rustls-webpki" version = "0.101.7" @@ -4905,6 +5045,17 @@ 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 = [ + "ring 0.17.8", + "rustls-pki-types", + "untrusted 0.9.0", +] + [[package]] name = "rustversion" version = "1.0.14" @@ -5859,7 +6010,18 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls", + "rustls 0.21.10", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +dependencies = [ + "rustls 0.22.3", + "rustls-pki-types", "tokio", ] @@ -5960,8 +6122,8 @@ dependencies = [ "futures-util", "h2", "http 0.2.12", - "http-body", - "hyper", + "http-body 0.4.6", + "hyper 0.14.28", "hyper-timeout", "percent-encoding", "pin-project", @@ -6005,7 +6167,7 @@ dependencies = [ "futures-core", "futures-util", "http 0.2.12", - "http-body", + "http-body 0.4.6", "http-range-header", "pin-project-lite", "tower-layer", @@ -6167,7 +6329,7 @@ dependencies = [ "tikv-jemalloc-sys", "tikv-jemallocator", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", "toml", "toml_edit 0.22.9", "tracing", @@ -6394,7 +6556,7 @@ dependencies = [ "bytes", "derive_builder", "http 0.2.12", - "reqwest", + "reqwest 0.11.27", "rustify", "rustify_derive", "serde", @@ -6551,6 +6713,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" diff --git a/Cargo.toml b/Cargo.toml index ad2be239..52205789 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -38,7 +38,7 @@ mlua = "0.8" once_cell = "1.17" openssl = { version="=0.10.60" } # pinned; see patch below openssl-sys = { version="0.9" } -reqwest = {version="0.11", default-features=false, features=["rustls-tls"]} +reqwest = {version="0.12", default-features=false, features=["rustls-tls"]} rustls = "0.21" sqlite = "0.32" tempfile = "3.10"