Implementing the TODO in pingora-core rustls listener to avoid panics by returning a Result

pingora-cache/src/cache_control.rs

@@ -12,8 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Functions and utilities to help parse Cache-Control headers
-
+/// Functions and utilities to help parse Cache-Control headers
 use super::*;
 
 use http::header::HeaderName;

pingora-core/src/listeners/mod.rs

@@ -188,9 +188,14 @@ impl TransportStackBuilder {
         #[cfg(windows)]
         let l4 = builder.listen().await?;
 
+        let tls_val = match self.tls.take() {
+            Some(tls) => Some(Arc::new(tls.build()?)),
+            None => None,
+        };
+
         Ok(TransportStack {
             l4,
-            tls: self.tls.take().map(|tls| Arc::new(tls.build())),
+            tls: tls_val,
             l4_buffer: self.l4_buffer,
             pre_tls_callback: self.pre_tls_callback.clone(),
         })

pingora-core/src/listeners/tls/boringssl_openssl/mod.rs

@@ -129,11 +129,11 @@ impl TlsSettings {
         }
     }
 
-    pub(crate) fn build(self) -> Acceptor {
-        Acceptor {
+    pub(crate) fn build(self) -> Result<Acceptor> {
+        Ok(Acceptor {
             ssl_acceptor: self.accept_builder.build(),
             callbacks: self.callbacks,
-        }
+        })
     }
 }
 

pingora-core/src/listeners/tls/rustls/mod.rs

@@ -46,8 +46,7 @@ impl TlsSettings {
     /// _NOTE_ This function will panic if there is an error in loading
     /// certificate files or constructing the builder
     ///
-    /// Todo: Return a result instead of panicking XD
-    pub fn build(self) -> Acceptor {
+    pub fn build(self) -> Result<Acceptor> {
         // rustls 0.23+ requires an explicit CryptoProvider.
         pingora_rustls::install_default_crypto_provider();
 
@@ -77,10 +76,10 @@ impl TlsSettings {
             config.alpn_protocols = alpn_protocols;
         }
 
-        Acceptor {
+        Ok(Acceptor {
             acceptor: RusTlsAcceptor::from(Arc::new(config)),
             callbacks: None,
-        }
+        })
     }
 
     /// Enable HTTP/2 support for this endpoint, which is default off.

pingora-core/src/listeners/tls/s2n/mod.rs

@@ -43,7 +43,7 @@ pub struct Acceptor {
 }
 
 impl TlsSettings {
-    pub fn build(self) -> Acceptor {
+    pub fn build(self) -> Result<Acceptor> {
         let mut builder = Config::builder();
 
         // Default security policy with TLS 1.3 support
@@ -94,9 +94,9 @@ impl TlsSettings {
             security_policy: Some(policy.clone()),
         };
 
-        Acceptor {
+        Ok(Acceptor {
             acceptor: TlsAcceptor::new(connection_builder),
-        }
+        })
     }
 
     /// Enable HTTP/2 support for this endpoint, which is default off.

pingora-core/src/protocols/tls/noop_tls/mod.rs

@@ -80,8 +80,8 @@ pub mod listeners {
     pub struct TlsSettings;
 
     impl TlsSettings {
-        pub fn build(&self) -> Acceptor {
-            Acceptor
+        pub fn build(&self) -> Result<Acceptor> {
+            Ok(Acceptor)
         }
 
         pub fn intermediate(_: &str, _: &str) -> Result<Self> {