Skip to content

Commit

Permalink
Do not continue when SSL handshake fails
Browse files Browse the repository at this point in the history
  • Loading branch information
lslezak committed Mar 22, 2024
1 parent 7972c8d commit 7ed3e58
Showing 1 changed file with 11 additions and 10 deletions.
21 changes: 11 additions & 10 deletions rust/agama-server/src/agama-web-server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -179,18 +179,19 @@ async fn handle_https_stream(
let mut tls_stream = SslStream::new(ssl, tcp_stream).unwrap();
if let Err(err) = SslStream::accept(Pin::new(&mut tls_stream)).await {
tracing::error!("Error during TSL handshake from {}: {}", addr, err);
}
} else {
let stream = TokioIo::new(tls_stream);
let hyper_service = hyper::service::service_fn(move |request: Request<Incoming>| {
service.clone().call(request)
});

let stream = TokioIo::new(tls_stream);
let hyper_service =
hyper::service::service_fn(move |request: Request<Incoming>| service.clone().call(request));
let ret = Builder::new(TokioExecutor::new())
.serve_connection_with_upgrades(stream, hyper_service)
.await;

let ret = Builder::new(TokioExecutor::new())
.serve_connection_with_upgrades(stream, hyper_service)
.await;

if let Err(err) = ret {
tracing::error!("Error serving connection from {}: {}", addr, err);
if let Err(err) = ret {
tracing::error!("Error serving connection from {}: {}", addr, err);
}
}
}

Expand Down

0 comments on commit 7ed3e58

Please sign in to comment.