Skip to content

Commit a8106d9

Browse files
reqwest: re-apply 0.13 bump at 0.13.4 with explicit TLS backend pin
Re-application of MaterializeInc#36215 (reverted in MaterializeInc#36241 for flaky Kafka auth schema-registry TLS tests) with three changes: - reqwest 0.13.4 instead of 0.13.2. Upstream has since fixed several bugs in the TLS config layer, notably PEM parsing of CRL values and native-tls ALPN/TLS 1.3 handling. sentry 0.47 already ships reqwest 0.13.3 in our tree, so 0.13 itself is not new here. - ccsr pins its client to tls_backend_native(). reqwest 0.13 defaults to rustls whenever transitive deps compile the rustls backend in, and ccsr's certificates and identities are prepared for native-tls. The April flake surfaced OpenSSL PEM errors at connect time on exactly this client, consistent with TLS backend/verifier drift. - The Azure transport client comes from the reqwest_0_12 alias, keeping the BlobKnobs timeout plumbing on both the emulator and production paths. azure_core 0.21 implements HttpClient only for reqwest 0.12. The alias also covers iceberg's RequestAuthenticator, which gained a second impl (Sigv4Authenticator) since April. Co-Authored-By: Claude Fable 5 <[email protected]>
1 parent b8f14cb commit a8106d9

3 files changed

Lines changed: 64 additions & 42 deletions

File tree

‎Cargo.lock‎

Lines changed: 56 additions & 40 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/ccsr/src/config.rs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,11 @@ impl ClientConfig {
104104

105105
/// Builds the [`Client`].
106106
pub fn build(self) -> Result<Client, anyhow::Error> {
107-
let mut builder = reqwest::ClientBuilder::new();
107+
// Pin the TLS backend explicitly. With reqwest 0.13, rustls is the
108+
// default whenever both backends are compiled in (transitive deps
109+
// enable the rustls feature), and our certificates and identities
110+
// are prepared for native-tls.
111+
let mut builder = reqwest::ClientBuilder::new().tls_backend_native();
108112

109113
for root_cert in self.root_certs {
110114
builder = builder.add_root_certificate(root_cert.into());

‎src/storage-types/src/connections.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ use rdkafka::ClientContext;
6161
use rdkafka::config::FromClientConfigAndContext;
6262
use rdkafka::consumer::{BaseConsumer, Consumer};
6363
use regex::Regex;
64-
use reqwest::Request;
64+
// iceberg's `RequestAuthenticator` trait is defined against reqwest 0.12;
65+
// see `reqwest_0_12` in the workspace Cargo.toml.
66+
use reqwest_0_12::Request;
6567
use serde::{Deserialize, Deserializer, Serialize};
6668
use tokio::net;
6769
use tokio::runtime::Handle;

0 commit comments

Comments
 (0)