mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
refine shellchat net tls test
This commit is contained in:
parent
bb2b7f05e7
commit
a3740df71a
1 changed files with 37 additions and 28 deletions
|
|
@ -95,43 +95,52 @@ 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!(
|
||||||
"GET / HTTP/1.1\r\nHost: {}\r\nConnection: close\r\nAccept-Encoding: identity\r\n\r\n",
|
"GET / HTTP/1.1\r\nHost: {}\r\nConnection: close\r\nAccept-Encoding: identity\r\n\r\n",
|
||||||
target
|
target
|
||||||
);
|
);
|
||||||
match tls.write_all(msg.as_bytes()) {
|
match tls.write_all(msg.as_bytes()) {
|
||||||
Ok(()) => {
|
Ok(()) => {
|
||||||
log::info!("tls accepted GET");
|
log::info!("tls accepted GET");
|
||||||
write!(ret, "{}", t!("tls.test_success_get", locales::LANG)).ok();
|
write!(ret, "{}", t!("tls.test_success_get", locales::LANG)).ok();
|
||||||
let mut plaintext = Vec::new();
|
let mut plaintext = Vec::new();
|
||||||
log::info!("read TLS response");
|
log::info!("read TLS response");
|
||||||
match tls.read_to_end(&mut plaintext) {
|
match tls.read_to_end(&mut plaintext) {
|
||||||
Ok(n) => {
|
Ok(n) => {
|
||||||
log::info!("tls received {} bytes", n);
|
log::info!("tls received {} bytes", n);
|
||||||
write!(
|
write!(
|
||||||
ret,
|
ret,
|
||||||
"{} {}\n",
|
"{} {}\n",
|
||||||
t!("tls.test_success_bytes", locales::LANG),
|
t!("tls.test_success_bytes", locales::LANG),
|
||||||
n
|
n
|
||||||
)
|
)
|
||||||
.ok();
|
.ok();
|
||||||
log::info!("{}", from_utf8(&plaintext).unwrap_or("utf-error"));
|
log::info!(
|
||||||
|
"{}",
|
||||||
|
from_utf8(&plaintext).unwrap_or("utf-error")
|
||||||
|
);
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
log::warn!("failed to read tls response: {e}");
|
||||||
|
write!(ret, "{e}\n").ok();
|
||||||
|
}
|
||||||
|
};
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::warn!("failed to read tls response: {e}");
|
log::warn!("failed to GET on tls connection: {e}");
|
||||||
write!(ret, "{e}\n").ok();
|
write!(ret, "{e}\n").ok();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::warn!("failed to GET on tls connection: {e}");
|
log::warn!("failed to construct ClientConnection: {e}");
|
||||||
write!(ret, "{e}\n").ok();
|
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}");
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue