diff --git a/libs/tls/locales/i18n.json b/libs/tls/locales/i18n.json index d2b499427..f6f4cdea3 100644 --- a/libs/tls/locales/i18n.json +++ b/libs/tls/locales/i18n.json @@ -43,6 +43,10 @@ "en": "failed to create sever name from", "en-tts": "failed to create sever name from" }, + "tls.probe_done": { + "en": "trusted CA's", + "en-tts": "trusted CA's" + }, "tls.test_cmd": { "en": "make tls connection to host", "en-tts": "make tls connection to host" diff --git a/libs/tls/src/cmd.rs b/libs/tls/src/cmd.rs index bb08a5320..1101be15e 100644 --- a/libs/tls/src/cmd.rs +++ b/libs/tls/src/cmd.rs @@ -116,7 +116,7 @@ pub fn shellchat<'a>( Some(certificates) => { let tls = Tls::new(); let count = tls.check_trust(certificates); - write!(ret, "trusted {count} certificates").ok(); + write!(ret, "{} {}", count, t!("tls.probe_done", locales::LANG)).ok(); } None => (), }; diff --git a/libs/tls/src/lib.rs b/libs/tls/src/lib.rs index 22ba7272d..fdf7451ce 100644 --- a/libs/tls/src/lib.rs +++ b/libs/tls/src/lib.rs @@ -19,7 +19,6 @@ use xous_names::XousNames; /// PDDB Dict for tls trusted certificates keys const TLS_TRUSTED_DICT: &str = "tls.trusted"; -const CURRENT_VERSION_KEY: &str = "__version"; pub struct Tls { pddb: pddb::Pddb, diff --git a/libs/tls/src/rota.rs b/libs/tls/src/rota.rs index c78e49f39..e7d1072b3 100644 --- a/libs/tls/src/rota.rs +++ b/libs/tls/src/rota.rs @@ -4,7 +4,6 @@ use der::{Encode, Header, Reader, Tag}; use rkyv::{Archive, Deserialize, Serialize}; use std::cmp::min; use std::convert::TryInto; -use std::fmt; use std::io::{Error, ErrorKind}; use x509_parser::prelude::{FromDer, X509Certificate}; diff --git a/libs/tls/src/trusted.rs b/libs/tls/src/trusted.rs deleted file mode 100644 index 3b6c56b40..000000000 --- a/libs/tls/src/trusted.rs +++ /dev/null @@ -1,57 +0,0 @@ -use crate::get_cert; -use crate::{rota::RustlsOwnedTrustAnchor, TLS_TRUSTED_DICT}; -use rustls::RootCertStore; -use std::io::Error; -use std::path::PathBuf; - -pub struct Trusted { - trusted: std::fs::ReadDir, -} - -impl Trusted { - pub fn new() -> Result { - let mut keypath = PathBuf::new(); - keypath.push(TLS_TRUSTED_DICT); - if !std::fs::metadata(&keypath).is_ok() { - log::info!("dict '{}' does NOT exist.. creating it", TLS_TRUSTED_DICT); - std::fs::create_dir_all(&keypath)?; - } - Ok(Self { - trusted: std::fs::read_dir(keypath)?, - }) - } -} - -impl Iterator for Trusted { - type Item = RustlsOwnedTrustAnchor; - - fn next(&mut self) -> Option { - match self.trusted.next() { - Some(Ok(dir_entry)) => match dir_entry.file_name().into_string() { - Ok(key) => { - log::info!("path: {}", key); - get_cert(&key).unwrap_or(None) - } - Err(e) => { - log::warn!("failed to read cert: {:?}", e); - None - } - }, - Some(Err(e)) => { - log::warn!("failed to list trusted certs: {}", e); - None - } - None => None, - } - } -} - -impl Into for Trusted { - fn into(self) -> RootCertStore { - let mut root_store = rustls::RootCertStore::empty(); - let trusted = Trusted::new().unwrap(); - root_store - .add_server_trust_anchors(trusted.map(|t| Into::::into(t))); - root_store - } -} diff --git a/services/shellchat/src/cmds/net_cmd.rs b/services/shellchat/src/cmds/net_cmd.rs index c2e4cda2b..e960241a6 100644 --- a/services/shellchat/src/cmds/net_cmd.rs +++ b/services/shellchat/src/cmds/net_cmd.rs @@ -453,10 +453,12 @@ impl<'a> ShellCmdApi<'a> for NetCmd { } } // net tls + // deleteall deleteall trusted CA certificates + // help + // list list all trusted CA certificates // mozilla trust all Root CA's in webpki-roots // probe save host CA'a if trusted // test make tls connection to host - // trusted list trusted CA certificates #[cfg(feature = "tls")] "tls" => { if let Ok(Some(r)) = tls::cmd::shellchat(&mut tokens) {