feat: parse pem certificates

Cargo.toml

@@ -43,7 +43,7 @@ hyper-rustls = { version = "0.23.0", features = ["webpki-roots"] }
 local-ip-address = "0.4.4"
 mime_guess = "2.0.4"
 rustls = "0.20.4"
-rustls-pemfile = "0.3.0"
+rustls-pemfile = "1.0.0"
 termcolor = "1.1.3"
 tokio = { version = "1.18.1", features = ["fs", "rt-multi-thread", "signal", "macros"] }
 tokio-rustls = "0.23.3"

src/config/util/tls.rs

@@ -1,10 +1,9 @@
-use anyhow::{ensure, Context, Error, Result};
-use rustls::internal::msgs::codec::{Codec, Reader};
+use anyhow::{Context, Error, Result};
 use rustls::{Certificate, PrivateKey};
 use rustls_pemfile::{pkcs8_private_keys, rsa_private_keys};
 use serde::Deserialize;
 use std::fs::File;
-use std::io::{BufRead, BufReader};
+use std::io::BufReader;
 use std::path::Path;
 use std::str::FromStr;
 
@@ -36,19 +35,9 @@ pub fn load_cert(path: &Path) -> Result<Vec<Certificate>> {
         path.to_str().unwrap()
     ))?;
     let mut buf_reader = BufReader::new(file);
-    let bytes = buf_reader
-        .fill_buf()
-        .context("Failed to read cerficate bytes.")?;
+    let cert_bytes = &rustls_pemfile::certs(&mut buf_reader).unwrap()[0];
 
-    ensure!(bytes.is_empty(), "The provided certificate is empty");
-
-    let mut reader = Reader::init(bytes);
-
-    if let Some(cert) = Certificate::read(&mut reader) {
-        return Ok(vec![cert]);
-    }
-
-    Err(Error::msg("Failed to read certificate"))
+    Ok(vec![Certificate(cert_bytes.to_vec())])
 }
 
 pub fn load_private_key(path: &Path, kind: &PrivateKeyAlgorithm) -> Result<PrivateKey> {
@@ -68,6 +57,5 @@ pub fn load_private_key(path: &Path, kind: &PrivateKeyAlgorithm) -> Result<Priva
         })?,
     };
 
-    ensure!(keys.len() == 1, "Expected a single private key");
     Ok(PrivateKey(keys[0].clone()))
 }

src/server/mod.rs

@@ -105,7 +105,7 @@ impl Server {
             println!("Serving HTTPS: {}", address);
         }
 
-        if let Err(e) = server
+        let server_with_graceful_shutdown = server
             .serve(make_service_fn(|_| {
                 // Move a clone of `handler` into the `service_fn`.
                 let handler = handler.clone();
@@ -116,8 +116,9 @@ impl Server {
                     }))
                 }
             }))
-            .await
-        {
+            .with_graceful_shutdown(crate::utils::signal::shutdown_signal());
+
+        if let Err(e) = server_with_graceful_shutdown.await {
             eprint!("Server Error: {}", e);
         }
     }