Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 14 additions & 91 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 13 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -353,10 +353,12 @@ features = ["serde"]

# Email sending
[workspace.dependencies.lettre]
version = "0.11.15"
version = "0.11.18"
default-features = false
features = [
"tokio1-rustls-tls",
"tokio1-rustls",
"rustls-platform-verifier",
"aws-lc-rs",
"hostname",
"builder",
"tracing",
Expand Down Expand Up @@ -499,7 +501,13 @@ version = "1.11.1"
[workspace.dependencies.reqwest]
version = "0.12.22"
default-features = false
features = ["http2", "rustls-tls-manual-roots", "charset", "json", "socks"]
features = [
"http2",
"rustls-tls-manual-roots-no-provider",
"charset",
"json",
"socks",
]

# RSA cryptography
[workspace.dependencies.rsa]
Expand All @@ -516,7 +524,7 @@ version = "0.15.4"

# TLS stack
[workspace.dependencies.rustls]
version = "0.23.30"
version = "0.23.31"

# PEM parsing for rustls
[workspace.dependencies.rustls-pemfile]
Expand All @@ -528,7 +536,7 @@ version = "1.12.0"

# Use platform-specific verifier for TLS
[workspace.dependencies.rustls-platform-verifier]
version = "0.5.3"
version = "0.6.0"

# systemd service status notification
[workspace.dependencies.sd-notify]
Expand Down
8 changes: 7 additions & 1 deletion crates/http/src/reqwest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,13 @@ impl reqwest::dns::Resolve for TracingResolver {
#[must_use]
pub fn client() -> reqwest::Client {
// TODO: can/should we limit in-flight requests?
let tls_config = rustls::ClientConfig::with_platform_verifier();

// The explicit typing here is because `use_preconfigured_tls` accepts
// `Any`, but wants a `ClientConfig` under the hood. This helps us detect
// breaking changes in the rustls-platform-verifier API.
let tls_config: rustls::ClientConfig =
rustls::ClientConfig::with_platform_verifier().expect("failed to create TLS config");

reqwest::Client::builder()
.dns_resolver(Arc::new(TracingResolver::new()))
.use_preconfigured_tls(tls_config)
Expand Down
1 change: 0 additions & 1 deletion deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ skip = [
{ name = "indexmap", version = "1.9.3" }, # schemars depends on this old version
{ name = "hashbrown", version = "0.12.3" }, # schemars -> indexmap depends on this old version
{ name = "hashbrown", version = "0.14.5" }, # a few crates depend on this old version
{ name = "socket2", version = "0.5.10" }, # a few crates depend on socket2 0.5
# a few dependencies depend on the 1.x version of thiserror
{ name = "thiserror", version = "1.0.69" },
{ name = "thiserror-impl", version = "1.0.69" },
Expand Down
Loading