Merge branch 'odin' of git.hitchhiker-linux.org:jeang3nie/dory into odin

src/connection/builder.rs

@@ -1,14 +1,14 @@
-use super::verifier::Verifier;
-use crate::prelude::CertificateStore;
-use std::net::TcpStream;
+use super::{Verifier, FingerPrintStore};
+use rustls::ServerConfig;
+use std::{net::TcpStream, sync::Arc};
 
 #[derive(Debug)]
-pub struct Builder<S: CertificateStore> {
+pub struct Builder<S: FingerPrintStore> {
     pub stream: Option<TcpStream>,
     pub verifier: Option<Verifier<S>>,
 }
 
-impl<S: CertificateStore> Default for Builder<S> {
+impl<S: FingerPrintStore> Default for Builder<S> {
     fn default() -> Self {
         Self {
             stream: None,
@@ -17,7 +17,7 @@ impl<S: CertificateStore> Default for Builder<S> {
     }
 }
 
-impl<S: CertificateStore> Builder<S> {
+impl<S: FingerPrintStore + 'static> Builder<S> {
     pub fn new() -> Self {
         Self::default()
     }
@@ -32,7 +32,12 @@ impl<S: CertificateStore> Builder<S> {
         self
     }
 
-    pub fn build(self) -> super::Connection {
+    pub fn build(self) -> Result<super::Connection, rustls::Error> {
+        let cfg = ServerConfig::builder()
+            .with_safe_default_cipher_suites()
+            .with_safe_default_kx_groups()
+            .with_safe_default_protocol_versions()?
+            .with_client_cert_verifier(Arc::new(self.verifier.unwrap()));
         todo!()
     }
 }

src/connection/error.rs

@@ -1 +1,2 @@
-
+#[derive(Debug)]
+pub struct Error;

src/connection/mod.rs

@@ -2,6 +2,8 @@ pub mod builder;
 pub mod error;
 pub mod verifier;
 
+pub use self::{builder::Builder, error::Error, verifier::{FingerPrintStore, Verifier}};
+
 #[derive(Debug)]
 pub struct Connection {
     pub inner: rustls::ServerConnection,

src/connection/verifier.rs

@@ -1,7 +1,30 @@
-use crate::prelude::CertificateStore;
+use rustls::server::ClientCertVerifier;
+
+use crate::{prelude::CertificateStore, mailuser::Mailuser};
 use std::sync::Mutex;
 
 #[derive(Debug)]
-pub struct Verifier<S: CertificateStore> {
+pub struct Verifier<S: FingerPrintStore> {
     pub store: Mutex<S>,
 }
+
+pub trait FingerPrintStore: Send + Sync {
+    fn get_mailuser(&self, fingerprint: &str) -> Option<Mailuser>;
+    fn insert_mailuser(&mut self, fingerprint: &str, user: &str) -> Option<Mailuser>;
+    fn contains_mailuser(&self, fingerprint: &str) -> bool;
+}
+
+impl<S: FingerPrintStore> ClientCertVerifier for Verifier<S> {
+    fn client_auth_root_subjects(&self) -> &[rustls::DistinguishedName] {
+        todo!()
+    }
+
+    fn verify_client_cert(
+            &self,
+            end_entity: &rustls::Certificate,
+            intermediates: &[rustls::Certificate],
+            now: std::time::SystemTime,
+        ) -> Result<rustls::server::ClientCertVerified, rustls::Error> {
+        todo!()
+    }
+}