Skip to content

fix(server): add 10s timeout to TLS handshake #651

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

Closed
persimmon16 wants to merge 1 commit into from
+11 −3
Closed

fix(server): add 10s timeout to TLS handshake #651

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
14 changes: 11 additions & 3 deletions crates/openshell-server/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,19 +206,27 @@ pub async fn run_server(config: Config, tracing_log_bus: TracingLogBus) -> Resul
if let Some(ref acceptor) = tls_acceptor {
let tls_acceptor = acceptor.clone();
tokio::spawn(async move {
match tls_acceptor.inner().accept(stream).await {
Ok(tls_stream) => {
match tokio::time::timeout(
std::time::Duration::from_secs(10),
tls_acceptor.inner().accept(stream),
)
.await
{
Ok(Ok(tls_stream)) => {
if let Err(e) = service.serve(tls_stream).await {
error!(error = %e, client = %addr, "Connection error");
}
}
Err(e) => {
Ok(Err(e)) => {
if is_benign_tls_handshake_failure(&e) {
debug!(error = %e, client = %addr, "TLS handshake closed early");
} else {
error!(error = %e, client = %addr, "TLS handshake failed");
}
}
Err(_) => {
debug!(client = %addr, "TLS handshake timed out");
}
}
});
} else {
Expand Down
Loading