Proxmox/proxmox
5
0
Fork 1
Code Issues Pull Requests Releases Activity

fix #5808: http: use native-tls instead of rustls for the sync client

Browse Source 
In the reference Bugzilla entry, a certificate with an IP address as a
SAN was used. rustls seems to have problems with that [1].
Also, pretty much all of our code uses native-tls at the moment, so
it makes sense to not pull in a second TLS implementation.

Tested by rebuilding libpve-rs-perl and testing a Gotify notification
target with a self-signed TLS certificate (one that is accepted by
OpenSSL but not by rusttls).

[1] https://github.com/rustls/rustls/issues/184

Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
This commit is contained in:
Lukas Wagner 2024-10-24 11:45:04 +02:00 committed by Fabian Grünbichler
parent f5e7f4ed7f
commit e8e5c11c6a
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
proxmox-http/Cargo.toml
View File

@ -17,11 +17,12 @@ base64 = { workspace = true, optional = true }
futures = { workspace = true, optional = true }
http = { workspace = true, optional = true }
hyper = { workspace = true, optional = true }
native-tls = { workspace = true, optional = true }
openssl = { version = "0.10", optional = true }
serde_json = { workspace = true, optional = true }
tokio = { workspace = true, features = [], optional = true }
tokio-openssl = { workspace = true, optional = true }
ureq = { version = "2.4", features = ["native-certs"], optional = true }
ureq = { version = "2.4", features = ["native-certs", "native-tls"], optional = true, default-features = false }
url = { workspace = true, optional = true }
proxmox-async = { workspace = true, optional = true }
@ -61,7 +62,7 @@ client = [
"rate-limited-stream",
"tokio?/io-util",
]
client-sync = [ "client-trait", "http-helpers", "dep:ureq" ]
client-sync = [ "client-trait", "http-helpers", "dep:ureq", "dep:native-tls" ]
client-trait = [ "dep:http" ]
http-helpers = [ "dep:base64", "dep:http", "dep:proxmox-sys", "dep:serde_json", "dep:url" ]
websocket = [

4
proxmox-http/src/client/sync.rs
View File

@ -1,5 +1,6 @@
use std::collections::HashMap;
use std::io::Read;
use std::sync::Arc;
use anyhow::Error;
use http::Response;
@ -21,6 +22,9 @@ impl Client {
fn agent(&self) -> Result<ureq::Agent, Error> {
let mut builder = ureq::AgentBuilder::new();
let connector = Arc::new(native_tls::TlsConnector::new()?);
builder = builder.tls_connector(connector);
builder = builder.user_agent(self.options.user_agent.as_deref().unwrap_or(concat!(
"proxmox-sync-http-client/",
env!("CARGO_PKG_VERSION")