Skip to content

fix: cleanly close the connect tunnel #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
agrimault-dinum wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: cleanly close the connect tunnel #119

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/proxy/http_connect.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use hyper::{
use hyper_util::rt::{TokioExecutor, TokioIo};
use std::io;
use std::sync::Arc;
use tokio::io::{AsyncRead, AsyncWrite};
use tokio::io::{AsyncRead, AsyncWrite, AsyncWriteExt};
use tokio::net::TcpStream;
use tokio::sync::RwLock;
use tracing::{debug, error, info, warn};
Expand Down Expand Up @@ -316,6 +316,13 @@ async fn handle_http_request(
if let Err(e) = tokio::io::copy_bidirectional(&mut client, &mut *stream).await {
error!("CONNECT tunnel error: {}", e);
}

// Send close_notify on TLS streams
// Send TCP FIN otherwise
// See https://github.com/rustls/tokio-rustls/blob/182345793062971bec711c2d773e75a08767eeeb/src/client.rs#L459
if let Err(e) = stream.shutdown().await {
debug!("CONNECT upstream shutdown error: {}", e);
}
}
Err(e) => debug!("CONNECT upgrade error: {}", e),
}
Expand Down
Loading