Actually that was quite a stupid way of handling timeoutsdocker-33

1 files changed, 14 insertions, 4 deletions

diff --git a/src/reverse_proxy.rs b/src/reverse_proxy.rs
index f4ded40..6ea15a0 100644
--- a/src/reverse_proxy.rs
+++ b/src/reverse_proxy.rs
@@ -5,19 +5,21 @@ use std::convert::TryInto;
 use std::net::IpAddr;
 use std::str::FromStr;
 use std::sync::Arc;
-use std::time::SystemTime;
+use std::time::{Duration, SystemTime};
 
 use anyhow::Result;
 use log::*;
 
 use http::header::HeaderName;
 use hyper::header::{HeaderMap, HeaderValue};
-use hyper::{header, Body, Client, Request, Response, Uri};
+use hyper::{client::HttpConnector, header, Body, Client, Request, Response, Uri};
 use rustls::client::{ServerCertVerified, ServerCertVerifier};
 use rustls::{Certificate, ServerName};
 
 use crate::tls_util::HttpsConnectorFixedDnsname;
 
+pub const PROXY_TIMEOUT: Duration = Duration::from_secs(60);
+
 const HOP_HEADERS: &[HeaderName] = &[
 	header::CONNECTION,
 	//header::KEEP_ALIVE,
@@ -128,7 +130,11 @@ pub async fn call(
 
 	trace!("Proxied request: {:?}", proxied_request);
 
-	let client = Client::new();
+	let mut connector = HttpConnector::new();
+	connector.set_connect_timeout(Some(PROXY_TIMEOUT));
+
+	let client: Client<_, hyper::Body> = Client::builder().build(connector);
+
 	let response = client.request(proxied_request).await?;
 
 	trace!("Inner response: {:?}", response);
@@ -150,7 +156,11 @@ pub async fn call_https(
 		.with_safe_defaults()
 		.with_custom_certificate_verifier(Arc::new(DontVerifyServerCert))
 		.with_no_client_auth();
-	let connector = HttpsConnectorFixedDnsname::new(tls_config, "dummy");
+
+	let mut http_connector = HttpConnector::new();
+	http_connector.set_connect_timeout(Some(PROXY_TIMEOUT));
+	let connector = HttpsConnectorFixedDnsname::new(tls_config, "dummy", http_connector);
+
 	let client: Client<_, hyper::Body> = Client::builder().build(connector);
 	let response = client.request(proxied_request).await?;