From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 5FA2E70979 for ; Fri, 14 May 2021 15:45:06 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5997417A6F for ; Fri, 14 May 2021 15:45:06 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 8F36317A59 for ; Fri, 14 May 2021 15:45:05 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 5D2DC46571 for ; Fri, 14 May 2021 15:45:05 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Fri, 14 May 2021 15:44:42 +0200 Message-Id: <20210514134457.1447930-7-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210514134457.1447930-1-f.gruenbichler@proxmox.com> References: <20210514134457.1447930-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.016 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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. [lib.rs, wrapper.rs, mod.rs] Subject: [pbs-devel] [PATCH proxmox 06/13] http: takeover MaybeTlsStream from proxmox_backup 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: , X-List-Received-Date: Fri, 14 May 2021 13:45:06 -0000 this is just a (rather HTTP specific) wrapper, so put it into a 'wrapper' module for now. Signed-off-by: Fabian Grünbichler --- proxmox-http/Cargo.toml | 4 +- proxmox-http/src/http/mod.rs | 3 + proxmox-http/src/http/wrapper.rs | 122 +++++++++++++++++++++++++++++++ proxmox-http/src/lib.rs | 3 + 4 files changed, 131 insertions(+), 1 deletion(-) create mode 100644 proxmox-http/src/http/mod.rs create mode 100644 proxmox-http/src/http/wrapper.rs diff --git a/proxmox-http/Cargo.toml b/proxmox-http/Cargo.toml index 641ace2..f1f53da 100644 --- a/proxmox-http/Cargo.toml +++ b/proxmox-http/Cargo.toml @@ -18,11 +18,13 @@ futures = { version = "0.3", optional = true } hyper = { version = "0.14", features = [ "full" ], optional = true } openssl = { version = "0.10", optional = true } tokio = { version = "1.0", features = [], optional = true } +tokio-openssl = { version = "0.6.1", optional = true } proxmox = { path = "../proxmox", optional = true, version = "0.11.3", default-features = false } [features] default = [] -client = [] +client = [ "http-helpers" ] +http-helpers = [ "hyper", "tokio/io-util", "tokio-openssl" ] websocket = [ "base64", "futures", "hyper", "openssl", "proxmox/tokio", "tokio/io-util", "tokio/sync" ] diff --git a/proxmox-http/src/http/mod.rs b/proxmox-http/src/http/mod.rs new file mode 100644 index 0000000..09fa42f --- /dev/null +++ b/proxmox-http/src/http/mod.rs @@ -0,0 +1,3 @@ +mod wrapper; + +pub use wrapper::MaybeTlsStream; diff --git a/proxmox-http/src/http/wrapper.rs b/proxmox-http/src/http/wrapper.rs new file mode 100644 index 0000000..3399b28 --- /dev/null +++ b/proxmox-http/src/http/wrapper.rs @@ -0,0 +1,122 @@ +use std::io; +use std::pin::Pin; +use std::task::{Context, Poll}; + +use hyper::client::connect::{Connection, Connected}; +use tokio::io::{AsyncRead, AsyncWrite, ReadBuf}; +use tokio_openssl::SslStream; + +/// Asynchronous stream, possibly encrypted and proxied +/// +/// Usefule for HTTP client implementations using hyper. +pub enum MaybeTlsStream { + Normal(S), + Proxied(S), + Secured(SslStream), +} + +impl AsyncRead for MaybeTlsStream { + fn poll_read( + self: Pin<&mut Self>, + cx: &mut Context, + buf: &mut ReadBuf, + ) -> Poll> { + match self.get_mut() { + MaybeTlsStream::Normal(ref mut s) => { + Pin::new(s).poll_read(cx, buf) + } + MaybeTlsStream::Proxied(ref mut s) => { + Pin::new(s).poll_read(cx, buf) + } + MaybeTlsStream::Secured(ref mut s) => { + Pin::new(s).poll_read(cx, buf) + } + } + } +} + +impl AsyncWrite for MaybeTlsStream { + fn poll_write( + self: Pin<&mut Self>, + cx: &mut Context, + buf: &[u8], + ) -> Poll> { + match self.get_mut() { + MaybeTlsStream::Normal(ref mut s) => { + Pin::new(s).poll_write(cx, buf) + } + MaybeTlsStream::Proxied(ref mut s) => { + Pin::new(s).poll_write(cx, buf) + } + MaybeTlsStream::Secured(ref mut s) => { + Pin::new(s).poll_write(cx, buf) + } + } + } + + fn poll_write_vectored( + self: Pin<&mut Self>, + cx: &mut Context<'_>, + bufs: &[io::IoSlice<'_>], + ) -> Poll> { + match self.get_mut() { + MaybeTlsStream::Normal(ref mut s) => { + Pin::new(s).poll_write_vectored(cx, bufs) + } + MaybeTlsStream::Proxied(ref mut s) => { + Pin::new(s).poll_write_vectored(cx, bufs) + } + MaybeTlsStream::Secured(ref mut s) => { + Pin::new(s).poll_write_vectored(cx, bufs) + } + } + } + + fn is_write_vectored(&self) -> bool { + match self { + MaybeTlsStream::Normal(s) => s.is_write_vectored(), + MaybeTlsStream::Proxied(s) => s.is_write_vectored(), + MaybeTlsStream::Secured(s) => s.is_write_vectored(), + } + } + + fn poll_flush(self: Pin<&mut Self>, cx: &mut Context) -> Poll> { + match self.get_mut() { + MaybeTlsStream::Normal(ref mut s) => { + Pin::new(s).poll_flush(cx) + } + MaybeTlsStream::Proxied(ref mut s) => { + Pin::new(s).poll_flush(cx) + } + MaybeTlsStream::Secured(ref mut s) => { + Pin::new(s).poll_flush(cx) + } + } + } + + fn poll_shutdown(self: Pin<&mut Self>, cx: &mut Context) -> Poll> { + match self.get_mut() { + MaybeTlsStream::Normal(ref mut s) => { + Pin::new(s).poll_shutdown(cx) + } + MaybeTlsStream::Proxied(ref mut s) => { + Pin::new(s).poll_shutdown(cx) + } + MaybeTlsStream::Secured(ref mut s) => { + Pin::new(s).poll_shutdown(cx) + } + } + } +} + +// we need this for the hyper http client +impl Connection for MaybeTlsStream +{ + fn connected(&self) -> Connected { + match self { + MaybeTlsStream::Normal(s) => s.connected(), + MaybeTlsStream::Proxied(s) => s.connected().proxy(true), + MaybeTlsStream::Secured(s) => s.get_ref().connected(), + } + } +} diff --git a/proxmox-http/src/lib.rs b/proxmox-http/src/lib.rs index 31e44af..5e3f9ec 100644 --- a/proxmox-http/src/lib.rs +++ b/proxmox-http/src/lib.rs @@ -1,2 +1,5 @@ #[cfg(feature = "websocket")] pub mod websocket; + +#[cfg(feature = "http-helpers")] +pub mod http; -- 2.20.1