mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-15 08:30:02 +00:00
improve tls error handling
This commit is contained in:
parent
ab8d40189a
commit
d6fe702278
2 changed files with 54 additions and 31 deletions
|
|
@ -188,7 +188,15 @@ pub fn check_trust(certificates: &[Certificate]) -> bool {
|
|||
)
|
||||
})
|
||||
.for_each(|(key, val)| {
|
||||
save_cert(&key, &val).expect("failed to save trusted cert");
|
||||
save_cert(&key, &val).unwrap_or_else(|e| {
|
||||
log::warn!("failed to save cert: {e}");
|
||||
modals
|
||||
.show_notification(
|
||||
format!("failed to save: {}", &val.subject()).as_str(),
|
||||
None,
|
||||
)
|
||||
.expect("modal failed");
|
||||
});
|
||||
});
|
||||
trusted.len() > 0
|
||||
}
|
||||
|
|
|
|||
|
|
@ -502,7 +502,11 @@ impl<'a> ShellCmdApi<'a> for NetCmd {
|
|||
Some(target) => target,
|
||||
None => "bunnyfoo.com",
|
||||
};
|
||||
let server_name = target.try_into().unwrap();
|
||||
let server_name = target.try_into().unwrap_or_else(|e| {
|
||||
log::warn!("failed to create sever_name from {target}: {e}");
|
||||
write!(ret, "failed to create sever_name from {target}");
|
||||
"bunnyfoo.com".try_into().unwrap()
|
||||
});
|
||||
let mut conn =
|
||||
rustls::ClientConnection::new(Arc::new(config), server_name)
|
||||
.unwrap();
|
||||
|
|
@ -547,44 +551,55 @@ impl<'a> ShellCmdApi<'a> for NetCmd {
|
|||
None => "bunnyfoo.com",
|
||||
};
|
||||
log::info!("point TLS to {}", target);
|
||||
let mut conn =
|
||||
rustls::ClientConnection::new(Arc::new(config), target.try_into().unwrap())
|
||||
.unwrap();
|
||||
let mut conn = rustls::ClientConnection::new(
|
||||
Arc::new(config),
|
||||
target.try_into().unwrap(),
|
||||
)
|
||||
.unwrap();
|
||||
|
||||
log::info!("connect TCPstream to {}", target);
|
||||
let url = format!("{}:443", target);
|
||||
let mut sock = TcpStream::connect(url).unwrap();
|
||||
let mut tls = rustls::Stream::new(&mut conn, &mut sock);
|
||||
log::info!("create http headers and write to server");
|
||||
let msg = format!("GET / HTTP/1.1\r\nHost: {}\r\nConnection: close\r\nAccept-Encoding: identity\r\n\r\n", target);
|
||||
match tls.write_all(msg.as_bytes()) {
|
||||
Ok(()) => {
|
||||
log::info!("GET on tls accepted");
|
||||
write!(ret, "GET on tls accepted\n").ok();
|
||||
match TcpStream::connect(url) {
|
||||
Ok(mut sock) => {
|
||||
log::info!("tcp connected");
|
||||
write!(ret, "tcp connected\n").ok();
|
||||
let mut tls = rustls::Stream::new(&mut conn, &mut sock);
|
||||
log::info!("create http headers and write to server");
|
||||
let msg = format!("GET / HTTP/1.1\r\nHost: {}\r\nConnection: close\r\nAccept-Encoding: identity\r\n\r\n", target);
|
||||
match tls.write_all(msg.as_bytes()) {
|
||||
Ok(()) => {
|
||||
log::info!("tls accepted GET");
|
||||
write!(ret, "tls accepted GET\n").ok();
|
||||
let mut plaintext = Vec::new();
|
||||
log::info!("read TLS response");
|
||||
match tls.read_to_end(&mut plaintext) {
|
||||
Ok(n) => {
|
||||
log::info!("tls received {} bytes", n);
|
||||
write!(ret, "tls received {} bytes\n", n).ok();
|
||||
log::info!(
|
||||
"{}",
|
||||
std::str::from_utf8(&plaintext)
|
||||
.unwrap_or("utf-error")
|
||||
);
|
||||
}
|
||||
Err(e) => {
|
||||
log::warn!("failed to read tls response: {e}");
|
||||
write!(ret, "{e}\n").ok();
|
||||
}
|
||||
};
|
||||
}
|
||||
Err(e) => {
|
||||
log::warn!("failed to GET on tls connection: {e}");
|
||||
write!(ret, "{e}\n").ok();
|
||||
}
|
||||
};
|
||||
}
|
||||
Err(e) => {
|
||||
log::warn!("failed to GET on tls connection: {e}");
|
||||
log::warn!("failed to connect tcp: {e}");
|
||||
write!(ret, "{e}\n").ok();
|
||||
}
|
||||
};
|
||||
|
||||
let mut plaintext = Vec::new();
|
||||
log::info!("read TLS response");
|
||||
match tls.read_to_end(&mut plaintext) {
|
||||
Ok(n) => {
|
||||
log::info!("received {} bytes in response on tls", n);
|
||||
write!(ret, "received {} bytes in response on tls\n", n).ok();
|
||||
}
|
||||
Err(e) => {
|
||||
log::warn!("failed to read tls response: {e}");
|
||||
write!(ret, "{e}\n").ok();
|
||||
}
|
||||
};
|
||||
log::info!(
|
||||
"{}",
|
||||
std::str::from_utf8(&plaintext).unwrap_or("utf-error")
|
||||
);
|
||||
|
||||
log::set_max_level(log::LevelFilter::Info);
|
||||
}
|
||||
// list trusted Certificate Authority certificates
|
||||
|
|
|
|||
Loading…
Reference in a new issue