From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 064ED1FF17A for ; Sat, 28 Sep 2024 11:43:34 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9CC3A31EE9; Sat, 28 Sep 2024 11:43:51 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Sat, 28 Sep 2024 11:42:53 +0200 Message-Id: <20240928094256.153991-2-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20240928094256.153991-1-c.ebner@proxmox.com> References: <20240928094256.153991-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.022 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. [connector.rs, proxmox.com, simple.rs] Subject: [pbs-devel] [POC proxmox 1/4] http: client: make https connector generic over resolver 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" Allow to instantiate a `HttpsConnector` not using the default `getaddrinfo` based `GaiResolver` for domain name resolution, but rather a custom resolver implementing the required traits. The usecase for this is to swap out the DNS resolver for the statically linked proxmox-backup-client binary, where the glibc dependency is problematic because of possible ABI incompatibility. Signed-off-by: Christian Ebner --- proxmox-http/Cargo.toml | 1 + proxmox-http/debian/control | 8 +++++--- proxmox-http/src/client/connector.rs | 17 ++++++++++++----- proxmox-http/src/client/simple.rs | 3 ++- 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/proxmox-http/Cargo.toml b/proxmox-http/Cargo.toml index a15c3367..4a78880c 100644 --- a/proxmox-http/Cargo.toml +++ b/proxmox-http/Cargo.toml @@ -21,6 +21,7 @@ openssl = { version = "0.10", optional = true } serde_json = { workspace = true, optional = true } tokio = { workspace = true, features = [], optional = true } tokio-openssl = { workspace = true, optional = true } +tower-service.workspace = true ureq = { version = "2.4", features = ["native-certs"], optional = true } url = { workspace = true, optional = true } diff --git a/proxmox-http/debian/control b/proxmox-http/debian/control index 2d4d74b7..f5402ae6 100644 --- a/proxmox-http/debian/control +++ b/proxmox-http/debian/control @@ -6,7 +6,8 @@ Build-Depends: debhelper (>= 12), cargo:native , rustc:native , libstd-rust-dev , - librust-anyhow-1+default-dev + librust-anyhow-1+default-dev , + librust-tower-service-0.3+default-dev Maintainer: Proxmox Support Team Standards-Version: 4.6.2 Vcs-Git: git://git.proxmox.com/git/proxmox.git @@ -19,7 +20,8 @@ Architecture: any Multi-Arch: same Depends: ${misc:Depends}, - librust-anyhow-1+default-dev + librust-anyhow-1+default-dev, + librust-tower-service-0.3+default-dev Suggests: librust-proxmox-http+client-dev (= ${binary:Version}), librust-proxmox-http+client-sync-dev (= ${binary:Version}), @@ -56,7 +58,7 @@ Depends: librust-hyper-0.14+stream-dev (>= 0.14.5-~~), librust-hyper-0.14+tcp-dev (>= 0.14.5-~~), librust-openssl-0.10+default-dev, - librust-proxmox-compression-0.2+default-dev (>= 0.2.3-~~), + librust-proxmox-compression-0.2+default-dev (>= 0.2.4-~~), librust-tokio-1+default-dev (>= 1.6-~~), librust-tokio-1+io-util-dev (>= 1.6-~~), librust-tokio-openssl-0.6+default-dev (>= 0.6.1-~~) diff --git a/proxmox-http/src/client/connector.rs b/proxmox-http/src/client/connector.rs index 63b9d10c..c0435c60 100644 --- a/proxmox-http/src/client/connector.rs +++ b/proxmox-http/src/client/connector.rs @@ -6,6 +6,7 @@ use std::task::{Context, Poll}; use futures::*; use http::Uri; +use hyper::client::connect::dns::Name; use hyper::client::HttpConnector; use openssl::ssl::SslConnector; use tokio::io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt}; @@ -23,8 +24,8 @@ use crate::{RateLimitedStream, ShareableRateLimit}; type SharedRateLimit = Arc; #[derive(Clone)] -pub struct HttpsConnector { - connector: HttpConnector, +pub struct HttpsConnector { + connector: HttpConnector, ssl_connector: Arc, proxy: Option, tcp_keepalive: u32, @@ -32,9 +33,9 @@ pub struct HttpsConnector { write_limiter: Option, } -impl HttpsConnector { +impl HttpsConnector { pub fn with_connector( - mut connector: HttpConnector, + mut connector: HttpConnector, ssl_connector: SslConnector, tcp_keepalive: u32, ) -> Self { @@ -122,7 +123,13 @@ impl HttpsConnector { } } -impl hyper::service::Service for HttpsConnector { +impl hyper::service::Service for HttpsConnector +where + T: tower_service::Service + Clone + Send + Sync + 'static, + T::Future: Send, + T::Error: Into>, + T::Response: std::iter::Iterator, +{ type Response = MaybeTlsStream>; type Error = Error; #[allow(clippy::type_complexity)] diff --git a/proxmox-http/src/client/simple.rs b/proxmox-http/src/client/simple.rs index 062889ac..cb8bb777 100644 --- a/proxmox-http/src/client/simple.rs +++ b/proxmox-http/src/client/simple.rs @@ -8,6 +8,7 @@ use futures::*; #[cfg(all(feature = "client-trait", feature = "proxmox-async"))] use http::header::HeaderName; use http::{HeaderValue, Request, Response}; +use hyper::client::connect::dns::GaiResolver; use hyper::client::Client as HyperClient; use hyper::client::HttpConnector; use hyper::Body; @@ -18,7 +19,7 @@ use crate::HttpOptions; /// Asynchronous HTTP client implementation pub struct Client { - client: HyperClient, + client: HyperClient, Body>, options: HttpOptions, } -- 2.39.5 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel