From 9f3bc582696e2f217a9bf4ca858d45127d26ed9a Mon Sep 17 00:00:00 2001 From: Kun Lai Date: Mon, 2 Nov 2026 00:56:18 +0800 Subject: [PATCH] deps: upgrade reqwest to 0.13.5 and artifact-resolve-sdk to main Bump the workspace reqwest dependency from 0.12 to 0.13, replacing the removed rustls-tls-native-roots feature with rustls: TLS roots now come from rustls-platform-verifier and webpki-roots is dropped. On native targets the rustls feature selects the aws-lc-rs provider; on wasm32 reqwest target-gates the whole rustls stack out and keeps the browser fetch backend, so aws-lc-rs is not compiled there. Bump artifact-resolve-sdk from e5ce195 to upstream main (8d65a85). The SDK's public API is unchanged; its only functional change is the same reqwest 0.12 to 0.13 bump, so the http_client() injection used by the AS policy-artifact-server tests stays on a single reqwest major and no renamed 0.12 alias is needed. The reqwest 0.11 and 0.12 entries still present in Cargo.lock come from the csv-rs and web3 git dependencies, not from workspace code. Assisted-by: Claude:glm-5.3 --- Cargo.lock | 249 ++++++++++++++++++++++++++++++--- Cargo.toml | 2 +- attestation-service/Cargo.toml | 2 +- 3 files changed, 229 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c5bbb1c..6bdab36 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -515,9 +515,9 @@ checksum = "d3fb67a6e08acf24fdeccbac2cb6ac4305825bd1f117462e0e6f2f193345ad56" [[package]] name = "artifact-resolve-sdk" version = "0.1.0" -source = "git+https://github.com/aliyun/artifact-server-rust-sdk.git?rev=e5ce1955940fb7da29e58a89d3b7d635091500ea#e5ce1955940fb7da29e58a89d3b7d635091500ea" +source = "git+https://github.com/aliyun/artifact-server-rust-sdk.git?rev=8d65a85227f12700901840593b01348a0de60499#8d65a85227f12700901840593b01348a0de60499" dependencies = [ - "reqwest 0.12.28", + "reqwest 0.13.5", "serde", "serde_json", "thiserror 2.0.20", @@ -661,7 +661,7 @@ dependencies = [ "rand 0.8.7", "reference-value-provider-service", "regorus", - "reqwest 0.12.28", + "reqwest 0.13.5", "rsa", "rstest", "rustls-pki-types", @@ -693,6 +693,29 @@ version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53" +[[package]] +name = "aws-lc-rs" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "048006790404103c488e6c5616b3e7e702a71292aadda08e8f7698a9e0d2eb53" +dependencies = [ + "aws-lc-sys", + "zeroize", +] + +[[package]] +name = "aws-lc-sys" +version = "0.47.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bfbe32ac36b3c428696ce315464181bc4029d689fd58e3f2a4e58c252242f52" +dependencies = [ + "cc", + "cmake", + "dunce", + "fs_extra", + "pkg-config", +] + [[package]] name = "axum" version = "0.7.9" @@ -817,6 +840,12 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" +[[package]] +name = "base64" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5" + [[package]] name = "base64-url" version = "2.0.2" @@ -1324,6 +1353,15 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "cmake" +version = "0.1.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0f78a02292a74a88ac736019ab962ece0bc380e3f977bf72e376c5d78ff0678" +dependencies = [ + "cc", +] + [[package]] name = "cmov" version = "0.5.4" @@ -1362,6 +1400,16 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570" +[[package]] +name = "combine" +version = "4.6.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4356eba6976435498d05a311ee9fc486da3bc81c200d3f0d7dd9703b41913f92" +dependencies = [ + "bytes", + "memchr", +] + [[package]] name = "concat-kdf" version = "0.1.0" @@ -1706,7 +1754,7 @@ dependencies = [ "openssl-sys", "schannel", "socket2 0.6.5", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -1721,7 +1769,7 @@ dependencies = [ "openssl-sys", "pkg-config", "vcpkg", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -2201,6 +2249,12 @@ dependencies = [ "zeroize", ] +[[package]] +name = "dunce" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" + [[package]] name = "dyn-clone" version = "1.0.20" @@ -2415,7 +2469,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -2650,6 +2704,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 = "funty" version = "2.0.0" @@ -3169,7 +3229,6 @@ dependencies = [ "hyper 1.11.0", "hyper-util", "rustls", - "rustls-native-certs", "tokio", "tokio-rustls", "tower-service", @@ -3235,7 +3294,7 @@ dependencies = [ "libc", "percent-encoding", "pin-project-lite", - "socket2 0.5.10", + "socket2 0.6.5", "system-configuration 0.7.0", "tokio", "tower-service", @@ -3525,7 +3584,7 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -3623,6 +3682,55 @@ dependencies = [ "jiff-tzdb", ] +[[package]] +name = "jni" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5efd9a482cf3a427f00d6b35f14332adc7902ce91efb778580e180ff90fa3498" +dependencies = [ + "cfg-if", + "combine", + "jni-macros", + "jni-sys", + "log", + "simd_cesu8", + "thiserror 2.0.20", + "walkdir", + "windows-link", +] + +[[package]] +name = "jni-macros" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00109accc170f0bdb141fed3e393c565b6f5e072365c3bd58f5b062591560a3" +dependencies = [ + "proc-macro2", + "quote", + "rustc_version", + "simd_cesu8", + "syn 2.0.119", +] + +[[package]] +name = "jni-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6377a88cb3910bee9b0fa88d4f42e1d2da8e79915598f65fb0c7ee14c878af2" +dependencies = [ + "jni-sys-macros", +] + +[[package]] +name = "jni-sys-macros" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264" +dependencies = [ + "quote", + "syn 2.0.119", +] + [[package]] name = "jobserver" version = "0.1.35" @@ -3811,7 +3919,7 @@ dependencies = [ "reference-value-provider-service", "regex", "regorus", - "reqwest 0.12.28", + "reqwest 0.13.5", "rsa", "rstest", "rustls-pki-types", @@ -3897,7 +4005,7 @@ dependencies = [ "p12", "prost", "rand 0.8.7", - "reqwest 0.12.28", + "reqwest 0.13.5", "ring", "rstest", "serde", @@ -4285,7 +4393,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -5288,7 +5396,7 @@ dependencies = [ "quinn-udp", "rustc-hash 2.1.3", "rustls", - "socket2 0.5.10", + "socket2 0.6.5", "thiserror 2.0.20", "tokio", "tracing", @@ -5301,6 +5409,7 @@ version = "0.11.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9746dbde176634f4f2f1faf2404e30a31b2bc1e9cafb5329c95d8177a18c9fc" dependencies = [ + "aws-lc-rs", "bytes", "getrandom 0.4.3", "lru-slab", @@ -5326,9 +5435,9 @@ dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2 0.5.10", + "socket2 0.6.5", "tracing", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -5501,7 +5610,7 @@ dependencies = [ "log", "path-clean", "prost", - "reqwest 0.12.28", + "reqwest 0.13.5", "rpm", "rstest", "serde", @@ -5654,7 +5763,6 @@ dependencies = [ "pin-project-lite", "quinn", "rustls", - "rustls-native-certs", "rustls-pki-types", "serde", "serde_json", @@ -5673,6 +5781,49 @@ dependencies = [ "webpki-roots 1.0.10", ] +[[package]] +name = "reqwest" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16a1cfa75cc186dd73d5818e510e042e40927bccc9c236b061cea97e1eb08029" +dependencies = [ + "base64 0.23.1", + "bytes", + "encoding_rs", + "futures-channel", + "futures-core", + "futures-util", + "h2 0.4.16", + "http 1.5.0", + "http-body 1.1.0", + "http-body-util", + "hyper 1.11.0", + "hyper-rustls", + "hyper-util", + "js-sys", + "log", + "mime", + "percent-encoding", + "pin-project-lite", + "quinn", + "rustls", + "rustls-pki-types", + "rustls-platform-verifier", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper 1.0.2", + "tokio", + "tokio-rustls", + "tower 0.5.3", + "tower-http", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + [[package]] name = "rfc6979" version = "0.4.0" @@ -5875,7 +6026,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.12.1", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -5884,6 +6035,7 @@ version = "0.23.46" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48e13bd8c0e9365c43cfa5c9e8f9ad49d3c8444926c9aac819e0e4dc503c8fdf" dependencies = [ + "aws-lc-rs", "log", "once_cell", "ring", @@ -5924,12 +6076,40 @@ dependencies = [ "zeroize", ] +[[package]] +name = "rustls-platform-verifier" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1167586491e2b18b8bfbb293e8180ec17c201c4f076d7cb3070ca964e7598f98" +dependencies = [ + "core-foundation 0.10.1", + "core-foundation-sys", + "jni", + "log", + "once_cell", + "rustls", + "rustls-native-certs", + "rustls-platform-verifier-android", + "rustls-webpki", + "security-framework", + "security-framework-sys", + "webpki-root-certs", + "windows-sys 0.61.2", +] + +[[package]] +name = "rustls-platform-verifier-android" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eec689c0bc40ff2458a5977b6619cb718087084a18e02a131c599b62d05e1a5f" + [[package]] name = "rustls-webpki" version = "0.103.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4443b1b6d39d7c663139942cc4558262562d2c84123bb6282ef177009ca8b281" dependencies = [ + "aws-lc-rs", "ring", "rustls-pki-types", "untrusted", @@ -5957,7 +6137,7 @@ dependencies = [ "key-value-storage", "log", "rand 0.8.7", - "reqwest 0.12.28", + "reqwest 0.13.5", "secp256k1", "serde", "serde_json", @@ -6630,6 +6810,22 @@ version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a219298ac11a56ea9a6d2120044824d6f01aeb034955e7af7bc16858527deea" +[[package]] +name = "simd_cesu8" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11031e251abf8611c80f460e19dbdeb54a66db918e49c65a7065b46ac7aec520" +dependencies = [ + "rustc_version", + "simdutf8", +] + +[[package]] +name = "simdutf8" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" + [[package]] name = "simple_asn1" version = "0.6.4" @@ -7179,7 +7375,7 @@ dependencies = [ "getrandom 0.4.3", "once_cell", "rustix 1.1.4", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -7966,7 +8162,7 @@ dependencies = [ "openssl-sys", "quick-xml", "regex", - "reqwest 0.12.28", + "reqwest 0.13.5", "rstest", "s390_pv", "scroll 0.11.0", @@ -8142,6 +8338,15 @@ dependencies = [ "url", ] +[[package]] +name = "webpki-root-certs" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e49d0e65abc00c142e8f9428da991da9f1a250c39be97459901eb12b9b49f62a" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "webpki-roots" version = "0.26.11" @@ -8204,7 +8409,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 8b75b2d..f179c2b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -51,7 +51,7 @@ regorus = { version = "0.11.0", default-features = false, features = [ "time", "std", ] } -reqwest = { version = "0.12", default-features = false, features = ["charset", "http2", "rustls-tls-native-roots", "json"] } +reqwest = { version = "0.13", default-features = false, features = ["charset", "http2", "rustls", "json", "query"] } rstest = "0.18.1" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0.89" diff --git a/attestation-service/Cargo.toml b/attestation-service/Cargo.toml index 0379e59..ac34231 100644 --- a/attestation-service/Cargo.toml +++ b/attestation-service/Cargo.toml @@ -114,7 +114,7 @@ actix-web = { workspace = true, optional = true } aes-gcm = "0.10" aes-kw = "0.2" anyhow.workspace = true -artifact-resolve-sdk = { git = "https://github.com/aliyun/artifact-server-rust-sdk.git", rev = "e5ce1955940fb7da29e58a89d3b7d635091500ea", optional = true } +artifact-resolve-sdk = { git = "https://github.com/aliyun/artifact-server-rust-sdk.git", rev = "8d65a85227f12700901840593b01348a0de60499", optional = true } async-trait.workspace = true base64.workspace = true canon-json = { git = "https://github.com/inclavare-containers/canon-json-rs" }