tuxmain/rust-rpxy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

suppress debug output for debug...

Browse source
This commit is contained in:
Jun Kurihara 2022-07-23 13:27:01 +09:00
commit 810f45248a
3 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/backend.rs
View file

@ -207,7 +207,7 @@ impl Backends {
pub async fn generate_server_crypto_with_cert_resolver(&self) -> Result<ServerConfig, anyhow::Error> { pub async fn generate_server_crypto_with_cert_resolver(&self) -> Result<ServerConfig, anyhow::Error> {
let mut resolver = ResolvesServerCertUsingSni::new(); let mut resolver = ResolvesServerCertUsingSni::new();
let mut cnt = 0; // let mut cnt = 0;
for (_, backend) in self.apps.iter() { for (_, backend) in self.apps.iter() {
if backend.tls_cert_key_path.is_some() && backend.tls_cert_path.is_some() { if backend.tls_cert_key_path.is_some() && backend.tls_cert_path.is_some() {
match backend.read_certs_and_key() { match backend.read_certs_and_key() {
@ -219,8 +219,8 @@ impl Backends {
e e
) )
} else { } else {
debug!("Add certificate for server_name: {}", backend.server_name.as_str()); // debug!("Add certificate for server_name: {}", backend.server_name.as_str());
cnt += 1; // cnt += 1;
} }
} }
Err(e) => { Err(e) => {
@ -229,7 +229,7 @@ impl Backends {
} }
} }
} }
debug!("Load certificate chain for {} server_name's", cnt); // debug!("Load certificate chain for {} server_name's", cnt);
let mut server_config = ServerConfig::builder() let mut server_config = ServerConfig::builder()
.with_safe_defaults() .with_safe_defaults()

2
src/constants.rs
View file

@ -7,7 +7,7 @@ pub const UPSTREAM_TIMEOUT_SEC: u64 = 60;
pub const MAX_CLIENTS: usize = 512; pub const MAX_CLIENTS: usize = 512;
pub const MAX_CONCURRENT_STREAMS: u32 = 64; pub const MAX_CONCURRENT_STREAMS: u32 = 64;
// #[cfg(feature = "tls")] // #[cfg(feature = "tls")]
pub const CERTS_WATCH_DELAY_SECS: u32 = 30; pub const CERTS_WATCH_DELAY_SECS: u32 = 60;
// #[cfg(feature = "http3")] // #[cfg(feature = "http3")]
// pub const H3_RESPONSE_BUF_SIZE: usize = 65_536; // 64KB // pub const H3_RESPONSE_BUF_SIZE: usize = 65_536; // 64KB

22
src/proxy/proxy_tls.rs
View file

@ -54,16 +54,22 @@ where
} }
let (raw_stream, client_addr) = tcp_cnx.unwrap(); let (raw_stream, client_addr) = tcp_cnx.unwrap();
if let Ok(stream) = tls_acceptor.as_ref().unwrap().accept(raw_stream).await { match tls_acceptor.as_ref().unwrap().accept(raw_stream).await {
// Retrieve SNI Ok(stream) => {
let (_, conn) = stream.get_ref(); // Retrieve SNI
let server_name = conn.sni_hostname(); let (_, conn) = stream.get_ref();
debug!("HTTP/2 or 1.1: SNI in ClientHello: {:?}", server_name); let server_name = conn.sni_hostname();
let server_name = server_name.map_or_else(|| None, |v| Some(v.as_bytes().to_ascii_lowercase())); debug!("HTTP/2 or 1.1: SNI in ClientHello: {:?}", server_name);
if server_name.is_none(){ let server_name = server_name.map_or_else(|| None, |v| Some(v.as_bytes().to_ascii_lowercase()));
if server_name.is_none(){
continue;
}
self.clone().client_serve(stream, server.clone(), client_addr, server_name); // TODO: don't want to pass copied value...
},
Err(e) => {
error!("Failed to accept TLS stream {}", e);
continue; continue;
} }
self.clone().client_serve(stream, server.clone(), client_addr, server_name); // TODO: don't want to pass copied value...
} }
} }
_ = server_crypto_rx.changed().fuse() => { _ = server_crypto_rx.changed().fuse() => {