client: module reorg

Author: phlip9

common/src/attest/cert.rs

@@ -7,8 +7,7 @@ use std::fmt;
 use rcgen::{date_time_ymd, DnType, RcgenError, SanType};
 use yasna::models::ObjectIdentifier;
 
-use crate::client_node_certs::lexe_distinguished_name_prefix;
-use crate::{ed25519, hex};
+use crate::{constants, ed25519, hex};
 
 /// An x509 certificate containing remote attestation endorsements, usually
 /// owned by the lexe node.
@@ -47,7 +46,7 @@ impl AttestationCert {
         attestation: rcgen::CustomExtension,
     ) -> Result<Self, RcgenError> {
         // TODO(phlip9): don't know how much DN matters...
-        let mut name = lexe_distinguished_name_prefix();
+        let mut name = constants::lexe_distinguished_name_prefix();
         name.push(DnType::CommonName, "node provisioning cert");
 
         let subject_alt_names = dns_names

common/src/client_node_certs.rs renamed to common/src/client/certs.rs

@@ -14,11 +14,11 @@
 //! channel via mTLS (mutual-auth TLS).
 
 use rcgen::{
-    date_time_ymd, BasicConstraints, CertificateParams, DistinguishedName,
-    DnType, IsCa, RcgenError, SanType,
+    date_time_ymd, BasicConstraints, CertificateParams, DnType, IsCa,
+    RcgenError, SanType,
 };
 
-use crate::ed25519;
+use crate::{constants, ed25519};
 
 /// The CA cert used as the trust anchor for both client and node.
 ///
@@ -39,19 +39,11 @@ pub struct ClientCert(rcgen::Certificate);
 /// The key pair for the node cert is sampled.
 pub struct NodeCert(rcgen::Certificate);
 
-pub fn lexe_distinguished_name_prefix() -> DistinguishedName {
-    let mut name = DistinguishedName::new();
-    name.push(DnType::CountryName, "US");
-    name.push(DnType::StateOrProvinceName, "CA");
-    name.push(DnType::OrganizationName, "lexe-tech");
-    name
-}
-
 // -- impl CaCert -- //
 
 impl CaCert {
     pub fn from_key_pair(key_pair: rcgen::KeyPair) -> Result<Self, RcgenError> {
-        let mut name = lexe_distinguished_name_prefix();
+        let mut name = constants::lexe_distinguished_name_prefix();
         name.push(DnType::CommonName, "client CA cert");
 
         let mut params = CertificateParams::default();
@@ -81,7 +73,7 @@ impl CaCert {
 
 impl ClientCert {
     pub fn from_key_pair(key_pair: rcgen::KeyPair) -> Result<Self, RcgenError> {
-        let mut name = lexe_distinguished_name_prefix();
+        let mut name = constants::lexe_distinguished_name_prefix();
         name.push(DnType::CommonName, "client cert");
 
         let mut params = CertificateParams::default();
@@ -123,7 +115,7 @@ impl NodeCert {
         key_pair: rcgen::KeyPair,
         dns_names: Vec<String>,
     ) -> Result<Self, RcgenError> {
-        let mut name = lexe_distinguished_name_prefix();
+        let mut name = constants::lexe_distinguished_name_prefix();
         name.push(DnType::CommonName, "node cert");
 
         let subject_alt_names = dns_names

common/src/client/mod.rs

@@ -0,0 +1,4 @@
+// hello
+
+pub mod certs;
+pub mod tls;

common/src/client.rs renamed to common/src/client/tls.rs

@@ -1,4 +1,4 @@
-// hello
+//! TODO
 
 use std::sync::Arc;
 use std::time::SystemTime;
@@ -7,7 +7,7 @@ use anyhow::{Context, Result};
 use rustls::client::{ServerCertVerifier, WebPkiVerifier};
 use rustls::RootCertStore;
 
-use crate::client_node_certs::{CaCert, ClientCert, NodeCert};
+use crate::client::certs::{CaCert, ClientCert, NodeCert};
 use crate::rng::Crng;
 use crate::root_seed::RootSeed;
 use crate::{attest, ed25519};
@@ -274,10 +274,8 @@ mod test {
                     .unwrap();
             let lexe_root = rustls::Certificate(lexe_root);
 
-            let config = crate::client::client_run_tls_config(
-                &mut rng, &lexe_root, &seed,
-            )
-            .unwrap();
+            let config =
+                client_run_tls_config(&mut rng, &lexe_root, &seed).unwrap();
 
             let connector = tokio_rustls::TlsConnector::from(Arc::new(config));
             let sni = rustls::ServerName::try_from(dns_name).unwrap();

common/src/constants.rs

@@ -0,0 +1,9 @@
+use rcgen::{DistinguishedName, DnType};
+
+pub fn lexe_distinguished_name_prefix() -> DistinguishedName {
+    let mut name = DistinguishedName::new();
+    name.push(DnType::CountryName, "US");
+    name.push(DnType::StateOrProvinceName, "CA");
+    name.push(DnType::OrganizationName, "lexe-tech");
+    name
+}

common/src/lib.rs

@@ -12,7 +12,7 @@ pub mod api;
 pub mod attest;
 pub mod cli;
 pub mod client;
-pub mod client_node_certs;
+pub mod constants;
 pub mod ed25519;
 pub mod enclave;
 pub mod hex;