From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 574531FF163 for ; Thu, 24 Oct 2024 11:44:31 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A0699B130; Thu, 24 Oct 2024 11:45:11 +0200 (CEST) From: Lukas Wagner To: pbs-devel@lists.proxmox.com Date: Thu, 24 Oct 2024 11:45:04 +0200 Message-Id: <20241024094504.141092-1-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.009 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [sync.rs] Subject: [pbs-devel] [PATCH proxmox] fix #5808: http: use native-tls instead of rustls for the sync client X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" 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 --- 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 { 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