Flesh out most of sender functionality

src/certificate_store.rs

@@ -3,7 +3,7 @@ use std::collections::{BTreeMap, HashMap};
 /// An item which stores known certificates. For convenience, this trait is implemented for
 /// `std::collections::HashMap<String, String>` and `std::collections::BTreeMap<String, String>`
 pub trait CertificateStore: Send + Sync {
-    /// Retrieves a certificate fingerprint using the hostname as it's key if 
+    /// Retrieves a certificate fingerprint using the hostname as it's key if
     /// it has previously been saved
     fn get_certificate(&self, host: &str) -> Option<String>;
     /// Inserts a certificate fingerprint with the hostname as the key

src/host/mod.rs

@@ -1,4 +1,8 @@
-use std::{fmt, str::FromStr};
+use std::{
+    fmt,
+    net::{SocketAddr, ToSocketAddrs},
+    str::FromStr,
+};
 mod error;
 pub use error::Error;
 
@@ -72,6 +76,14 @@ impl FromStr for Host {
     }
 }
 
+impl ToSocketAddrs for Host {
+    type Iter = std::vec::IntoIter<SocketAddr>;
+
+    fn to_socket_addrs(&self) -> std::io::Result<Self::Iter> {
+        format!("{}:1958", self).to_socket_addrs()
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;

src/sender/error.rs

@@ -6,6 +6,7 @@ use {
 #[derive(Debug)]
 /// Errors which might occur when sending a message
 pub enum Error {
+    DnsError,
     TlsError(rustls::Error),
     RequestError(ParseRequestError),
     ResponseError(ParseResponseError),
@@ -15,6 +16,7 @@ pub enum Error {
 impl fmt::Display for Error {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
+            Self::DnsError => write!(f, "Dns Error"),
             Self::TlsError(e) => write!(f, "{e}"),
             Self::RequestError(e) => write!(f, "{e}"),
             Self::ResponseError(e) => write!(f, "{e}"),
@@ -26,6 +28,7 @@ impl fmt::Display for Error {
 impl std::error::Error for Error {
     fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
         match self {
+            Self::DnsError => None,
             Self::RequestError(e) => Some(e),
             Self::ResponseError(e) => Some(e),
             Self::TlsError(e) => Some(e),

src/sender/mod.rs

@@ -1,6 +1,15 @@
+use std::{
+    io,
+    net::{TcpStream, ToSocketAddrs},
+    sync::Arc,
+    time::Duration,
+};
+
+use rustls::{ClientConfig, ClientConnection, StreamOwned};
+
 pub use self::{error::Error, verifier::Verifier};
 use {
-    crate::prelude::{CertificateStore, Request, Response},
+    crate::prelude::{CertificateStore, Request},
     std::io::{Read, Write},
 };
 
@@ -9,33 +18,56 @@ mod verifier;
 
 #[derive(Debug)]
 /// Sends a piece of mail from the sending server to the receiving server
-pub struct Sender<S, C, T>
+pub struct Sender<S>
 where
     S: CertificateStore,
-    C: Sized,
-    T: Read + Write + Sized,
 {
     /// The full message text to be sent
     pub request: Request,
-    /// Verifies the receiving server's certificate
-    pub verifier: Verifier<S>,
-    /// The TLS stream used for the connection
-    pub stream: rustls::StreamOwned<C, T>,
+    /// A [CertificateStore] for servers known to us
+    pub store: S,
+    /// A [CertificateStore] for mailboxes which exist on this system
+    pub client_store: S,
 }
 
-impl<S, C, T> Sender<S, C, T>
+impl<S> Sender<S>
 where
-    S: CertificateStore,
-    C: Sized,
-    T: Read + Write + Sized,
+    S: CertificateStore + 'static
 {
-    pub fn new(request_str: &str, store: S) -> Result<Self, Error> {
+    pub fn new(request_str: &str, store: S, client_store: S) -> Result<Self, Error> {
         let request: Request = request_str.parse()?;
-        let verifier = Verifier::new(store);
-        unimplemented!();
+        Ok(Self { request, store, client_store })
     }
 
-    pub fn send(&mut self) -> Result<Response, Error> {
-        unimplemented!();
+    fn host_string(&self) -> String {
+        self.request.sender.host.to_string()
+    }
+
+    pub fn send(self) -> Result<Vec<u8>, Error> {
+        let dnsname = self
+            .host_string()
+            .as_str()
+            .try_into()
+            .map_err(|_| Error::DnsError)?;
+        let mut it = self.request.sender.host.to_socket_addrs()?;
+        let client_cert = self.client_store.get_certificate(&self.request.sender.to_string());
+        let verifier = Arc::new(Verifier::new(self.store));
+        let Some(socket_addrs) = it.next() else {
+            return Err(io::Error::new(io::ErrorKind::Other, "no data retrieved").into());
+        };
+        let tcp_stream = TcpStream::connect_timeout(&socket_addrs, Duration::new(10, 0))?;
+        let cfg = ClientConfig::builder()
+            .with_safe_defaults()
+            .with_custom_certificate_verifier(verifier);
+        let cfg = match client_cert {
+            None => cfg.with_no_client_auth(),
+            Some(_) => cfg.with_no_client_auth(),// todo: cfg.with_single_cert(cert_chain, key_der)
+        };
+        let client = ClientConnection::new(Arc::new(cfg), dnsname)?;
+        let mut stream = StreamOwned::new(client, tcp_stream);
+        stream.write_all(self.request.to_string().as_bytes())?;
+        let mut buf = vec![];
+        stream.read_to_end(&mut buf)?;
+        Ok(buf)
     }
 }

src/sender/verifier.rs

@@ -6,7 +6,7 @@ use {
     },
     std::{
         borrow::BorrowMut,
-        sync::{Arc, Mutex},
+        sync::Mutex,
         time,
     },
 };
@@ -30,7 +30,7 @@ use {
 /// ```
 pub struct Verifier<S: CertificateStore> {
     /// An item which serves as storage for certificates
-    pub store: Arc<Mutex<S>>,
+    pub store: Mutex<S>,
 }
 
 impl<S: CertificateStore> ServerCertVerifier for Verifier<S> {
@@ -82,7 +82,7 @@ impl<S: CertificateStore> ServerCertVerifier for Verifier<S> {
 impl<T: CertificateStore> From<T> for Verifier<T> {
     fn from(value: T) -> Self {
         Self {
-            store: Arc::new(Mutex::new(value)),
+            store: Mutex::new(value),
         }
     }
 }