refactor: [#852] eenrich field types in TslConfig config struct

josecelano · josecelano · commit 3997cfa256a9 · 2024-05-10T16:03:32.000+01:00
diff --git a/packages/configuration/src/lib.rs b/packages/configuration/src/lib.rs
@@ -10,6 +10,7 @@ use std::collections::HashMap;
 use std::sync::Arc;
 use std::{env, fs};
 
+use camino::Utf8PathBuf;
 use derive_more::Constructor;
 use serde::{Deserialize, Serialize};
 use serde_with::{serde_as, NoneAsEmptyString};
@@ -165,8 +166,8 @@ impl From<figment::Error> for Error {
 pub struct TslConfig {
     /// Path to the SSL certificate file.
     #[serde_as(as = "NoneAsEmptyString")]
-    pub ssl_cert_path: Option<String>,
+    pub ssl_cert_path: Option<Utf8PathBuf>,
     /// Path to the SSL key file.
     #[serde_as(as = "NoneAsEmptyString")]
-    pub ssl_key_path: Option<String>,
+    pub ssl_key_path: Option<Utf8PathBuf>,
 }
diff --git a/src/bootstrap/jobs/http_tracker.rs b/src/bootstrap/jobs/http_tracker.rs
@@ -18,7 +18,7 @@ use log::info;
 use tokio::task::JoinHandle;
 use torrust_tracker_configuration::HttpTracker;
 
-use super::make_rust_tls;
+use super::make_rust_tls_from_path_buf;
 use crate::core;
 use crate::servers::http::server::{HttpServer, Launcher};
 use crate::servers::http::Version;
@@ -42,7 +42,7 @@ pub async fn start_job(
     if config.enabled {
         let socket = config.bind_address;
 
-        let tls = make_rust_tls(
+        let tls = make_rust_tls_from_path_buf(
             config.ssl_enabled,
             &config.tsl_config.ssl_cert_path,
             &config.tsl_config.ssl_key_path,
diff --git a/src/bootstrap/jobs/mod.rs b/src/bootstrap/jobs/mod.rs
@@ -28,7 +28,35 @@ pub async fn make_rust_tls(enabled: bool, cert: &Option<String>, key: &Option<St
 
     if let (Some(cert), Some(key)) = (cert, key) {
         info!("Using https: cert path: {cert}.");
-        info!("Using https: key path: {cert}.");
+        info!("Using https: key path: {key}.");
+
+        Some(
+            RustlsConfig::from_pem_file(cert, key)
+                .await
+                .map_err(|err| Error::BadTlsConfig {
+                    source: (Arc::new(err) as DynError).into(),
+                }),
+        )
+    } else {
+        Some(Err(Error::MissingTlsConfig {
+            location: Location::caller(),
+        }))
+    }
+}
+
+pub async fn make_rust_tls_from_path_buf(
+    enabled: bool,
+    cert: &Option<Utf8PathBuf>,
+    key: &Option<Utf8PathBuf>,
+) -> Option<Result<RustlsConfig, Error>> {
+    if !enabled {
+        info!("TLS not enabled");
+        return None;
+    }
+
+    if let (Some(cert), Some(key)) = (cert, key) {
+        info!("Using https: cert path: {cert}.");
+        info!("Using https: key path: {key}.");
 
         Some(
             RustlsConfig::from_pem_file(cert, key)
@@ -77,6 +105,7 @@ use std::panic::Location;
 use std::sync::Arc;
 
 use axum_server::tls_rustls::RustlsConfig;
+use camino::Utf8PathBuf;
 use log::info;
 use thiserror::Error;
 use torrust_tracker_located_error::{DynError, LocatedError};
diff --git a/src/servers/http/server.rs b/src/servers/http/server.rs
@@ -224,7 +224,7 @@ mod tests {
     use torrust_tracker_test_helpers::configuration::ephemeral_mode_public;
 
     use crate::bootstrap::app::initialize_with_configuration;
-    use crate::bootstrap::jobs::make_rust_tls;
+    use crate::bootstrap::jobs::make_rust_tls_from_path_buf;
     use crate::servers::http::server::{HttpServer, Launcher};
     use crate::servers::registar::Registar;
 
@@ -236,7 +236,7 @@ mod tests {
 
         let bind_to = config.bind_address;
 
-        let tls = make_rust_tls(
+        let tls = make_rust_tls_from_path_buf(
             config.ssl_enabled,
             &config.tsl_config.ssl_cert_path,
             &config.tsl_config.ssl_key_path,
diff --git a/tests/servers/http/environment.rs b/tests/servers/http/environment.rs
@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use futures::executor::block_on;
 use torrust_tracker::bootstrap::app::initialize_with_configuration;
-use torrust_tracker::bootstrap::jobs::make_rust_tls;
+use torrust_tracker::bootstrap::jobs::make_rust_tls_from_path_buf;
 use torrust_tracker::core::Tracker;
 use torrust_tracker::servers::http::server::{HttpServer, Launcher, Running, Stopped};
 use torrust_tracker::servers::registar::Registar;
@@ -33,7 +33,7 @@ impl Environment<Stopped> {
 
         let bind_to = config.bind_address;
 
-        let tls = block_on(make_rust_tls(
+        let tls = block_on(make_rust_tls_from_path_buf(
             config.ssl_enabled,
             &config.tsl_config.ssl_cert_path,
             &config.tsl_config.ssl_key_path,
