Skip to content

Commit 58e18d5

Browse files
committed
Another rustls fix
1 parent 819e87e commit 58e18d5

6 files changed

Lines changed: 203 additions & 3 deletions

File tree

Cargo.lock

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

Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ ldap3 = { version = "0.12", features = ["gssapi", "tls"] }
3434
moka = { version = "0.12", features = ["future"] }
3535
native-tls = "0.2.12"
3636
pin-project = "1.1"
37-
reqwest = { version = "0.13", default-features = false, features = ["json", "form", "query", "rustls-no-provider"] }
37+
reqwest = { version = "0.13", features = ["json", "form", "query"] }
38+
rustls = "0.23"
3839
rustls-pki-types = "1.13"
3940
semver = "1.0"
4041
serde = { version = "1.0", features = ["derive"] }

rust/bundle-builder/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ clap.workspace = true
1919
flate2.workspace = true
2020
futures.workspace = true
2121
hyper.workspace = true
22+
rustls.workspace = true
2223
snafu.workspace = true
2324
tar.workspace = true
2425
tokio.workspace = true

rust/bundle-builder/src/main.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,13 @@ enum StartupError {
8585
async fn main() -> Result<(), StartupError> {
8686
let args = Args::parse();
8787

88+
// As stackable-operator pulls in ring and reqwest >= 0.13 pulls in aws_lc_rs, we need
89+
// to explicitly tell rustls what provider to use. As other operators use ring, we use
90+
// that for consistency reasons here as well.
91+
rustls::crypto::ring::default_provider()
92+
.install_default()
93+
.expect("failed to install ring rustls provider");
94+
8895
// NOTE (@NickLarsenNZ): Before stackable-telemetry was used:
8996
// - The console log level was set by `OPA_BUNDLE_BUILDER_LOG`, and is now `CONSOLE_LOG` (when using Tracing::pre_configured).
9097
// - The file log level was set by `OPA_BUNDLE_BUILDER_LOG`, and is now set via `FILE_LOG` (when using Tracing::pre_configured).

rust/operator-binary/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ fnv.workspace = true
1919
futures.workspace = true
2020
indoc.workspace = true
2121
pin-project.workspace = true
22+
rustls.workspace = true
2223
semver.workspace = true
2324
serde_json.workspace = true
2425
serde.workspace = true

0 commit comments

Comments
 (0)