gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-07-26 08:18:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve code for tls

Browse Source
This commit is contained in:
houseme
2025-06-24 23:51:08 +08:00
parent 39a290e061
commit 37b4ab935d
1 changed files with 38 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rustfs/src/main.rs
+38 -14
View File
@@ -425,20 +425,44 @@ async fn run(opt: config::Opt) -> Result<()> {
if has_tls_certs {
debug!("TLS certificates found, starting with SIGINT");
let tls_socket = match tls_acceptor
.as_ref()
.ok_or_else(|| rustfs_utils::certs_error("TLS not configured".to_string()))
.map_err(|e| {
error!("TLS panic error: {}", e);
e
})
.unwrap()
.accept(socket)
.await
{
Ok(tls_socket) => tls_socket,
Err(err) => {
error!("TLS handshake failed {}", err);
// let tls_socket = match tls_acceptor
// .as_ref()
// .ok_or_else(|| rustfs_utils::certs_error("TLS not configured".to_string()))
// .map_err(|e| {
// error!("TLS panic error: {}", e);
// e
// })
// .unwrap()
// .accept(socket)
// .await
// {
// Ok(tls_socket) => tls_socket,
// Err(err) => {
// error!("TLS handshake failed {}", err);
// continue;
// }
// };
let peer_addr_str = socket.peer_addr().map(|a| a.to_string()).unwrap_or_else(|e| {
warn!("Could not get peer address: {}", e);
"unknown".to_string()
});
let tls_socket = match tls_acceptor.as_ref() {
Some(acceptor) => match acceptor.accept(socket).await {
Ok(tls_socket) => {
info!("TLS handshake successful with peer: {}", peer_addr_str);
tls_socket
}
Err(err) => {
error!("TLS handshake with peer {} failed: {}", peer_addr_str, err);
continue;
}
},
None => {
error!(
"TLS acceptor is not available, but TLS is enabled. This is a bug. Dropping connection from {}",
peer_addr_str
);
continue;
}
};