refine shellchat net tls test

This commit is contained in:
nworbnhoj 2024-02-27 07:23:09 +10:00
parent bb2b7f05e7
commit a3740df71a

View file

@ -95,8 +95,8 @@ pub fn shellchat<'a>(mut tokens: impl Iterator<Item = &'a str>) -> Result<Option
write!(ret, "{}", t!("tls.test_success_tcp", locales::LANG)).ok(); write!(ret, "{}", t!("tls.test_success_tcp", locales::LANG)).ok();
match ServerName::try_from(target.to_owned()) { match ServerName::try_from(target.to_owned()) {
Ok(server_name) => { Ok(server_name) => {
let mut conn = match rustls::ClientConnection::new(Arc::new(config), server_name) {
rustls::ClientConnection::new(Arc::new(config), server_name).unwrap(); Ok(mut conn) => {
let mut tls = rustls::Stream::new(&mut conn, &mut sock); let mut tls = rustls::Stream::new(&mut conn, &mut sock);
log::info!("create http headers and write to server"); log::info!("create http headers and write to server");
let msg = format!( let msg = format!(
@ -119,7 +119,10 @@ pub fn shellchat<'a>(mut tokens: impl Iterator<Item = &'a str>) -> Result<Option
n n
) )
.ok(); .ok();
log::info!("{}", from_utf8(&plaintext).unwrap_or("utf-error")); log::info!(
"{}",
from_utf8(&plaintext).unwrap_or("utf-error")
);
} }
Err(e) => { Err(e) => {
log::warn!("failed to read tls response: {e}"); log::warn!("failed to read tls response: {e}");
@ -133,6 +136,12 @@ pub fn shellchat<'a>(mut tokens: impl Iterator<Item = &'a str>) -> Result<Option
} }
}; };
} }
Err(e) => {
log::warn!("failed to construct ClientConnection: {e}");
write!(ret, "{e}\n").ok();
}
}
}
Err(e) => { Err(e) => {
log::warn!("failed to convert target into a valid ServerName: {e}"); log::warn!("failed to convert target into a valid ServerName: {e}");
write!(ret, "{e}\n").ok(); write!(ret, "{e}\n").ok();