mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
refactor tls::trusted
This commit is contained in:
parent
aeeff17a6a
commit
b67c015abc
2 changed files with 64 additions and 45 deletions
|
|
@ -1,5 +1,6 @@
|
||||||
pub mod cmd;
|
pub mod cmd;
|
||||||
pub mod danger;
|
pub mod danger;
|
||||||
|
pub mod trusted;
|
||||||
|
|
||||||
use modals::Modals;
|
use modals::Modals;
|
||||||
use rkyv::{
|
use rkyv::{
|
||||||
|
|
@ -88,55 +89,16 @@ impl Into<rustls::OwnedTrustAnchor> for RustlsOwnedTrustAnchor {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct Trusted {
|
|
||||||
trusted: std::fs::ReadDir,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Trusted {
|
|
||||||
pub fn new() -> Result<Trusted, Error> {
|
|
||||||
let mut keypath = PathBuf::new();
|
|
||||||
keypath.push(TLS_CERT_DICT);
|
|
||||||
if !std::fs::metadata(&keypath).is_ok() {
|
|
||||||
log::info!("dict '{}' does NOT exist.. creating it", TLS_CERT_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<Self::Item> {
|
|
||||||
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<RootCertStore> 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::<rustls::OwnedTrustAnchor>::into(t)));
|
|
||||||
root_store
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
57
libs/tls/src/trusted.rs
Normal file
57
libs/tls/src/trusted.rs
Normal file
|
|
@ -0,0 +1,57 @@
|
||||||
|
use crate::get_cert;
|
||||||
|
use crate::{RustlsOwnedTrustAnchor, TLS_CERT_DICT};
|
||||||
|
use rustls::RootCertStore;
|
||||||
|
use std::io::{Error, ErrorKind, Read, Write};
|
||||||
|
use std::path::PathBuf;
|
||||||
|
|
||||||
|
pub struct Trusted {
|
||||||
|
trusted: std::fs::ReadDir,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Trusted {
|
||||||
|
pub fn new() -> Result<Trusted, Error> {
|
||||||
|
let mut keypath = PathBuf::new();
|
||||||
|
keypath.push(TLS_CERT_DICT);
|
||||||
|
if !std::fs::metadata(&keypath).is_ok() {
|
||||||
|
log::info!("dict '{}' does NOT exist.. creating it", TLS_CERT_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<Self::Item> {
|
||||||
|
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<RootCertStore> 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::<rustls::OwnedTrustAnchor>::into(t)));
|
||||||
|
root_store
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in a new issue