enhancement: accept other certificates

env var P_OTHER_CERT_PATH accepts a directory path
where user can keep all the certificates intended to be accepted by the server

Author: nikhilsinhaparseable

server/src/cli.rs

@@ -34,6 +34,9 @@ pub struct Cli {
     /// The location of TLS Private Key file
     pub tls_key_path: Option<PathBuf>,
 
+    /// The location of other certificates to accept
+    pub other_cert_path: Option<PathBuf>,
+
     /// The address on which the http server will listen.
     pub address: String,
 
@@ -115,6 +118,7 @@ impl Cli {
     // identifiers for arguments
     pub const TLS_CERT: &'static str = "tls-cert-path";
     pub const TLS_KEY: &'static str = "tls-key-path";
+    pub const OTHER_CERT: &'static str = "other-cert-path";
     pub const ADDRESS: &'static str = "address";
     pub const DOMAIN_URI: &'static str = "origin";
     pub const STAGING: &'static str = "local-staging-path";
@@ -175,6 +179,14 @@ impl Cli {
                     .value_parser(validation::file_path)
                     .help("Local path on this device where private key file is located. Required to enable TLS"),
             )
+            .arg(
+                Arg::new(Self::OTHER_CERT)
+                    .long(Self::OTHER_CERT)
+                    .env("P_OTHER_CERT_PATH")
+                    .value_name("DIR")
+                    .value_parser(validation::canonicalize_path)
+                    .help("Local path on this device where other certificate files are located.")
+            )
             .arg(
                 Arg::new(Self::ADDRESS)
                     .long(Self::ADDRESS)
@@ -455,6 +467,7 @@ impl FromArgMatches for Cli {
         self.query_cache_path = m.get_one::<PathBuf>(Self::QUERY_CACHE).cloned();
         self.tls_cert_path = m.get_one::<PathBuf>(Self::TLS_CERT).cloned();
         self.tls_key_path = m.get_one::<PathBuf>(Self::TLS_KEY).cloned();
+        self.other_cert_path = m.get_one::<PathBuf>(Self::OTHER_CERT).cloned();
         self.domain_address = m.get_one::<Url>(Self::DOMAIN_URI).cloned();
 
         self.address = m

server/src/handlers/http/modal/ingest_server.rs

@@ -79,6 +79,7 @@ impl ParseableServer for IngestServer {
         let ssl = get_ssl_acceptor(
             &CONFIG.parseable.tls_cert_path,
             &CONFIG.parseable.tls_key_path,
+            &CONFIG.parseable.other_cert_path,
         )?;
 
         // fn that creates the app

server/src/handlers/http/modal/query_server.rs

@@ -63,6 +63,7 @@ impl ParseableServer for QueryServer {
         let ssl = get_ssl_acceptor(
             &CONFIG.parseable.tls_cert_path,
             &CONFIG.parseable.tls_key_path,
+            &CONFIG.parseable.other_cert_path,
         )?;
 
         let create_app_fn = move || {

server/src/handlers/http/modal/server.rs

@@ -94,6 +94,7 @@ impl ParseableServer for Server {
         let ssl = get_ssl_acceptor(
             &CONFIG.parseable.tls_cert_path,
             &CONFIG.parseable.tls_key_path,
+            &CONFIG.parseable.other_cert_path,
         )?;
 
         // concurrent workers equal to number of cores on the cpu

server/src/handlers/http/modal/ssl_acceptor.rs

@@ -16,21 +16,42 @@
  *
  */
 
-use std::{fs::File, io::BufReader, path::PathBuf};
+use std::{
+    fs::{self, File},
+    io::BufReader,
+    path::PathBuf,
+};
 
 use rustls::ServerConfig;
 
 pub fn get_ssl_acceptor(
     tls_cert: &Option<PathBuf>,
     tls_key: &Option<PathBuf>,
+    other_certs: &Option<PathBuf>,
 ) -> anyhow::Result<Option<ServerConfig>> {
     match (tls_cert, tls_key) {
         (Some(cert), Some(key)) => {
             let server_config = ServerConfig::builder().with_no_client_auth();
 
             let cert_file = &mut BufReader::new(File::open(cert)?);
             let key_file = &mut BufReader::new(File::open(key)?);
-            let certs = rustls_pemfile::certs(cert_file).collect::<Result<Vec<_>, _>>()?;
+
+            let mut certs = rustls_pemfile::certs(cert_file).collect::<Result<Vec<_>, _>>()?;
+            // Load CA certificates from the directory
+            if let Some(other_cert_dir) = other_certs {
+                if other_cert_dir.is_dir() {
+                    for entry in fs::read_dir(other_cert_dir)? {
+                        let path = entry.unwrap().path();
+
+                        if path.is_file() {
+                            let other_cert_file = &mut BufReader::new(File::open(&path)?);
+                            let mut other_certs = rustls_pemfile::certs(other_cert_file)
+                                .collect::<Result<Vec<_>, _>>()?;
+                            certs.append(&mut other_certs);
+                        }
+                    }
+                }
+            }
             let private_key = rustls_pemfile::private_key(key_file)?
                 .ok_or(anyhow::anyhow!("Could not parse private key."))?;