tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

HttpsConnector: code cleanup

Browse Source
This commit is contained in:
Dietmar Maurer 2021-04-21 13:17:01 +02:00 committed by Thomas Lamprecht
parent 26153589ba
commit 02a58862dd
1 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/tools/http.rs
View File

@ -3,6 +3,7 @@ use std::task::{Context, Poll};
use std::os::unix::io::AsRawFd; use std::os::unix::io::AsRawFd;
use std::collections::HashMap; use std::collections::HashMap;
use std::pin::Pin; use std::pin::Pin;
use std::sync::Arc;
use hyper::{Uri, Body}; use hyper::{Uri, Body};
use hyper::client::{Client, HttpConnector}; use hyper::client::{Client, HttpConnector};
@ -103,17 +104,16 @@ impl SimpleHttp {
#[derive(Clone)] #[derive(Clone)]
pub struct HttpsConnector { pub struct HttpsConnector {
http: HttpConnector, connector: HttpConnector,
ssl_connector: std::sync::Arc<SslConnector>, ssl_connector: Arc<SslConnector>,
} }
impl HttpsConnector { impl HttpsConnector {
pub fn with_connector(mut http: HttpConnector, ssl_connector: SslConnector) -> Self { pub fn with_connector(mut connector: HttpConnector, ssl_connector: SslConnector) -> Self {
http.enforce_http(false); connector.enforce_http(false);
Self { Self {
http, connector,
ssl_connector: std::sync::Arc::new(ssl_connector), ssl_connector: Arc::new(ssl_connector),
} }
} }
} }
@ -130,22 +130,20 @@ impl hyper::service::Service<Uri> for HttpsConnector {
} }
fn call(&mut self, dst: Uri) -> Self::Future { fn call(&mut self, dst: Uri) -> Self::Future {
let mut this = self.clone(); let mut connector = self.connector.clone();
let ssl_connector = Arc::clone(&self.ssl_connector);
let is_https = dst.scheme() == Some(&http::uri::Scheme::HTTPS);
let host = match dst.host() {
Some(host) => host.to_owned(),
None => {
return futures::future::err(format_err!("missing URL scheme")).boxed();
}
};
async move { async move {
let is_https = dst let config = ssl_connector.configure()?;
.scheme()
.ok_or_else(|| format_err!("missing URL scheme"))?
== "https";
let host = dst
.host()
.ok_or_else(|| format_err!("missing hostname in destination url?"))?
.to_string();
let config = this.ssl_connector.configure();
let dst_str = dst.to_string(); // for error messages let dst_str = dst.to_string(); // for error messages
let conn = this let conn = connector
.http
.call(dst) .call(dst)
.await .await
.map_err(|err| format_err!("error connecting to {} - {}", dst_str, err))?; .map_err(|err| format_err!("error connecting to {} - {}", dst_str, err))?;
@ -153,7 +151,7 @@ impl hyper::service::Service<Uri> for HttpsConnector {
let _ = set_tcp_keepalive(conn.as_raw_fd(), PROXMOX_BACKUP_TCP_KEEPALIVE_TIME); let _ = set_tcp_keepalive(conn.as_raw_fd(), PROXMOX_BACKUP_TCP_KEEPALIVE_TIME);
if is_https { if is_https {
let mut conn: SslStream<TcpStream> = SslStream::new(config?.into_ssl(&host)?, conn)?; let mut conn: SslStream<TcpStream> = SslStream::new(config.into_ssl(&host)?, conn)?;
Pin::new(&mut conn).connect().await?; Pin::new(&mut conn).connect().await?;
Ok(MaybeTlsStream::Secured(conn)) Ok(MaybeTlsStream::Secured(conn))
} else { } else {