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

workaround for upgrade error

Browse source
This commit is contained in:
Jun Kurihara 2022-07-06 06:33:05 +09:00
commit 53b85f28dc
No known key found for this signature in database
GPG key ID: 48ADFD173ED22B03
5 changed files with 52 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/proxy/proxy_handler.rs
View file

@ -118,13 +118,19 @@ where
let mut response_upgraded = res_backend
.extensions_mut()
.remove::<hyper::upgrade::OnUpgrade>()
.expect("Response does not have an upgrade extension")
.ok_or_else(|| anyhow!("Response does not have an upgrade extension"))? // TODO: any response code?
.await?;
// TODO: H3で死ぬことがある
// thread 'rpxy' panicked at 'Failed to upgrade request: hyper::Error(User(ManualUpgrade))', src/proxy/proxy_handler.rs:124:63
tokio::spawn(async move {
let mut request_upgraded = request_upgraded.await.expect("Failed to upgrade request");
let mut request_upgraded = request_upgraded.await.map_err(|e| {
error!("Failed to upgrade request: {}", e);
anyhow!("Failed to upgrade request: {}", e)
})?; // TODO: any response code?
copy_bidirectional(&mut response_upgraded, &mut request_upgraded)
.await
.expect("Coping between upgraded connections failed");
.map_err(|e| anyhow!("Coping between upgraded connections failed: {}", e))?; // TODO: any response code?
Ok(()) as Result<()>
});
Ok(res_backend)
} else {

57
src/proxy/proxy_tls.rs
View file

@ -110,44 +110,47 @@ where
loop {
// TODO: Not sure if this properly works to handle multiple "server_name"s to host multiple hosts.
// peek() should work for that.
if let Some(peeked_conn) = std::pin::Pin::new(&mut p).peek_mut().await {
let success = if let Some(peeked_conn) = std::pin::Pin::new(&mut p).peek_mut().await {
let hsd = peeked_conn.handshake_data().await;
let hsd_downcast = hsd?
.downcast::<quinn::crypto::rustls::HandshakeData>()
.unwrap();
let svn = if let Some(sni) = hsd_downcast.server_name {
sni
if let Some(svn) = hsd_downcast.server_name {
if let Some(new_server_crypto) = self.fetch_server_crypto(&svn) {
// Set ServerConfig::set_server_config for given SNI
let mut new_server_config_h3 =
quinn::ServerConfig::with_crypto(Arc::new(new_server_crypto));
if svn == "localhost" {
new_server_config_h3.concurrent_connections(512);
}
info!(
"HTTP/3 connection incoming (SNI {:?}): Overwrite ServerConfig",
svn
);
endpoint.set_server_config(Some(new_server_config_h3));
true
} else {
false
}
} else {
debug!("HTTP/3 no SNI is given");
continue;
};
let new_server_crypto = if let Some(p) = self.fetch_server_crypto(&svn) {
p
} else {
continue;
};
// Set ServerConfig::set_server_config for given SNI
let mut new_server_config_h3 =
quinn::ServerConfig::with_crypto(Arc::new(new_server_crypto));
if svn == "localhost" {
new_server_config_h3.concurrent_connections(512);
false
}
info!(
"HTTP/3 connection incoming (SNI {:?}): Overwrite ServerConfig",
svn
);
endpoint.set_server_config(Some(new_server_config_h3));
}
} else {
false
};
// Then acquire actual connection
let peekable_incoming = std::pin::Pin::new(&mut p);
if let Some(conn) = peekable_incoming.get_mut().next().await {
let fut = self.clone().client_serve_h3(conn);
self.globals.runtime_handle.spawn(async {
if let Err(e) = fut.await {
warn!("QUIC or HTTP/3 connection failed: {}", e)
}
});
if success {
let fut = self.clone().client_serve_h3(conn);
self.globals.runtime_handle.spawn(async {
if let Err(e) = fut.await {
warn!("QUIC or HTTP/3 connection failed: {}", e)
}
});
}
} else {
break;
}