[pbs-devel] [PATCH proxmox] fix #5808: http: use native-tls instead of rustls for the sync client

[pbs-devel] [PATCH proxmox] fix #5808: http: use native-tls instead of rustls for the sync client

[Lukas Wagner]

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>
---
 proxmox-http/Cargo.toml         | 5 +++--
 proxmox-http/src/client/sync.rs | 4 ++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/proxmox-http/Cargo.toml b/proxmox-http/Cargo.toml
index a15c3367..bc79c53d 100644
--- a/proxmox-http/Cargo.toml
+++ b/proxmox-http/Cargo.toml
@@ -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 = [
diff --git a/proxmox-http/src/client/sync.rs b/proxmox-http/src/client/sync.rs
index 195ce98f..fb10f5be 100644
--- a/proxmox-http/src/client/sync.rs
+++ b/proxmox-http/src/client/sync.rs
@@ -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")
-- 
2.39.5



_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel

[pbs-devel] applied: [PATCH proxmox] fix #5808: http: use native-tls instead of rustls for the sync client

[Fabian Grünbichler]

thanks!

Quoting Lukas Wagner (2024-10-24 11:45:04)
> 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>
> ---
>  proxmox-http/Cargo.toml         | 5 +++--
>  proxmox-http/src/client/sync.rs | 4 ++++
>  2 files changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/proxmox-http/Cargo.toml b/proxmox-http/Cargo.toml
> index a15c3367..bc79c53d 100644
> --- a/proxmox-http/Cargo.toml
> +++ b/proxmox-http/Cargo.toml
> @@ -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 = [
> diff --git a/proxmox-http/src/client/sync.rs b/proxmox-http/src/client/sync.rs
> index 195ce98f..fb10f5be 100644
> --- a/proxmox-http/src/client/sync.rs
> +++ b/proxmox-http/src/client/sync.rs
> @@ -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")
> -- 
> 2.39.5
> 
> 
> 
> _______________________________________________
> pbs-devel mailing list
> pbs-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
> 
>


_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel