feat: Support TLS config

lablup · Oct 3, 2024 · 87b00a0 · 87b00a0
1 parent e1a12d4
commit 87b00a0
Show file tree

Hide file tree

Showing 19 changed files with 476 additions and 150 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/examples/memstore/dynamic-members/src/main.rs b/examples/memstore/dynamic-members/src/main.rs
@@ -70,19 +70,17 @@ async fn main() -> std::result::Result<(), Box<dyn std::error::Error>> {
         Some(peer_addr) => {
             log::info!("Running in Follower mode");
 
-            let ticket = Raft::request_id(options.raft_addr.clone(), peer_addr.clone())
+            let ticket = Raft::request_id(options.raft_addr.clone(), peer_addr.clone(), None)
                 .await
                 .unwrap();
             let node_id = ticket.reserved_id;
-            let mut cfg = build_config(node_id);
-
-            cfg.initial_peers = Some(ticket.peers.clone().into());
+            let cfg = build_config(node_id, Some(ticket.peers.clone().into()));
 
             #[cfg(feature = "inmemory_storage")]
             let log_storage = MemStorage::create();
 
             #[cfg(feature = "heed_storage")]
-            let log_storage = HeedStorage::create(&cfg.log_dir, &cfg.clone(), logger.clone())
+            let log_storage = HeedStorage::create(cfg.get_log_dir(), &cfg.clone(), logger.clone())
                 .expect("Failed to create storage");
 
             #[cfg(feature = "rocksdb_storage")]
@@ -121,13 +119,13 @@ async fn main() -> std::result::Result<(), Box<dyn std::error::Error>> {
             }
 
             let leader_node_id = 1;
-            let cfg = build_config(leader_node_id);
+            let cfg = build_config(leader_node_id, None);
 
             #[cfg(feature = "inmemory_storage")]
             let log_storage = MemStorage::create();
 
             #[cfg(feature = "heed_storage")]
-            let log_storage = HeedStorage::create(&cfg.log_dir, &cfg.clone(), logger.clone())
+            let log_storage = HeedStorage::create(cfg.get_log_dir(), &cfg.clone(), logger.clone())
                 .expect("Failed to create storage");
 
             #[cfg(feature = "rocksdb_storage")]

diff --git a/examples/memstore/src/client/main.rs b/examples/memstore/src/client/main.rs
@@ -7,7 +7,7 @@ use memstore_example_harness::state_machine::LogEntry;
 #[actix_rt::main]
 async fn main() {
     println!("---Message propose---");
-    let mut leader_client = create_client(&"127.0.0.1:60061").await.unwrap();
+    let mut leader_client = create_client(&"127.0.0.1:60061", None).await.unwrap();
 
     leader_client
         .propose(raft_service::ProposeArgs {

diff --git a/examples/memstore/static-members/src/main.rs b/examples/memstore/static-members/src/main.rs
@@ -71,14 +71,13 @@ async fn main() -> std::result::Result<(), Box<dyn std::error::Error>> {
         .get_node_id_by_addr(options.raft_addr.clone())
         .unwrap();
 
-    let mut cfg = build_config(node_id);
-    cfg.initial_peers = Some(initial_peers.clone());
+    let cfg = build_config(node_id, Some(initial_peers.clone()));
 
     #[cfg(feature = "inmemory_storage")]
     let log_storage = MemStorage::create();
 
     #[cfg(feature = "heed_storage")]
-    let log_storage = HeedStorage::create(&cfg.log_dir, &cfg.clone(), logger.clone())
+    let log_storage = HeedStorage::create(cfg.get_log_dir(), &cfg.clone(), logger.clone())
         .expect("Failed to create storage");
 
     #[cfg(feature = "rocksdb_storage")]

diff --git a/examples/src/config.rs b/examples/src/config.rs
@@ -1,8 +1,8 @@
-use raftify::{Config, RaftConfig};
+use raftify::{Config, ConfigBuilder, Peers, RaftConfig, TlsConfig};
 
 use crate::utils::{ensure_directory_exist, get_storage_path};
 
-pub fn build_config(node_id: u64) -> Config {
+pub fn build_config(node_id: u64, initial_peers: Option<Peers>) -> Config {
     let raft_config = RaftConfig {
         id: node_id,
         election_tick: 10,
@@ -14,14 +14,27 @@ pub fn build_config(node_id: u64) -> Config {
     let storage_pth = get_storage_path("./logs", node_id);
     ensure_directory_exist(&storage_pth).expect("Failed to create storage directory");
 
-    Config {
-        bootstrap_from_snapshot: false,
-        tick_interval: 0.2,
-        log_dir: storage_pth.clone(),
-        save_compacted_logs: true,
-        compacted_log_dir: storage_pth,
-        compacted_log_size_threshold: 1024 * 1024 * 1024,
-        raft_config,
-        ..Default::default()
-    }
+    let client_tls_config = TlsConfig {
+        cert_path: None,
+        key_path: None,
+        ca_cert_path: Some("./ca_cert.pem".to_string()),
+        domain_name: Some("localhost".to_string()),
+    };
+
+    let config_builder = ConfigBuilder::new()
+        .log_dir("./logs".to_owned())
+        .save_compacted_logs(true)
+        .compacted_log_dir("./logs".to_owned())
+        .compacted_log_size_threshold(1024 * 1024 * 1024)
+        .raft_config(raft_config)
+        .tick_interval(0.2)
+        .global_client_tls_config(client_tls_config);
+
+    let config_builder = if let Some(peers) = initial_peers {
+        config_builder.initial_peers(peers)
+    } else {
+        config_builder
+    };
+
+    config_builder.build()
 }
diff --git a/harness/src/config.rs b/harness/src/config.rs
@@ -1,8 +1,8 @@
-use raftify::{Config, RaftConfig};
+use raftify::{Config, ConfigBuilder, Peers, RaftConfig};
 
 use crate::utils::{ensure_directory_exist, get_storage_path};
 
-pub fn build_config(node_id: u64) -> Config {
+pub fn build_config(node_id: u64, initial_peers: Option<Peers>) -> Config {
     let raft_config = RaftConfig {
         id: node_id,
         election_tick: 10,
@@ -14,12 +14,19 @@ pub fn build_config(node_id: u64) -> Config {
     let storage_path = get_storage_path("./logs", node_id);
     ensure_directory_exist(&storage_path).expect("Failed to create storage directory");
 
-    Config {
-        log_dir: storage_path.clone(),
-        save_compacted_logs: true,
-        compacted_log_dir: storage_path,
-        compacted_log_size_threshold: 1024 * 1024 * 1024,
-        raft_config,
-        ..Default::default()
-    }
+    let config_builder = ConfigBuilder::new()
+        .log_dir("./logs".to_owned())
+        .save_compacted_logs(true)
+        .compacted_log_dir("./logs".to_owned())
+        .compacted_log_size_threshold(1024 * 1024 * 1024)
+        .raft_config(raft_config)
+        .tick_interval(0.2);
+
+    let config_builder = if let Some(peers) = initial_peers {
+        config_builder.initial_peers(peers)
+    } else {
+        config_builder
+    };
+
+    config_builder.build()
 }
diff --git a/harness/src/raft.rs b/harness/src/raft.rs
@@ -51,16 +51,18 @@ fn run_raft(
     should_be_leader: bool,
 ) -> Result<JoinHandle<Result<()>>> {
     let peer = peers.get(node_id).unwrap();
-    let mut cfg = build_config(*node_id);
-    cfg.initial_peers = if should_be_leader {
-        None
-    } else {
-        Some(peers.clone())
-    };
+    let cfg = build_config(
+        *node_id,
+        if should_be_leader {
+            None
+        } else {
+            Some(peers.clone())
+        },
+    );
 
     let store = HashStore::new();
     let logger = build_logger();
-    let storage_pth = get_storage_path(cfg.log_dir.as_str(), *node_id);
+    let storage_pth = get_storage_path(cfg.get_log_dir(), *node_id);
     ensure_directory_exist(storage_pth.as_str())?;
 
     let storage = HeedStorage::create(
@@ -141,9 +143,9 @@ pub async fn spawn_extra_node(
         slog: build_logger(),
     });
 
-    let cfg = build_config(node_id);
+    let cfg = build_config(node_id, None);
     let store = HashStore::new();
-    let storage_pth = get_storage_path(cfg.log_dir.as_str(), node_id);
+    let storage_pth = get_storage_path(cfg.get_log_dir(), node_id);
     ensure_directory_exist(storage_pth.as_str())?;
 
     let storage = HeedStorage::create(&storage_pth, &cfg, logger.clone())?;
@@ -167,16 +169,16 @@ pub async fn spawn_and_join_extra_node(
     let logger = Arc::new(Slogger {
         slog: build_logger(),
     });
-    let join_ticket = Raft::request_id(raft_addr.to_owned(), peer_addr.to_owned())
+    let join_ticket = Raft::request_id(raft_addr.to_owned(), peer_addr.to_owned(), None)
         .await
         .unwrap();
 
     let node_id = join_ticket.reserved_id;
-    let mut cfg = build_config(node_id);
-    cfg.initial_peers = Some(join_ticket.peers.clone().into());
+    let cfg = build_config(node_id, Some(join_ticket.peers.clone().into()));
+
     let store = HashStore::new();
 
-    let storage_pth = get_storage_path(cfg.log_dir.as_str(), node_id);
+    let storage_pth = get_storage_path(cfg.get_log_dir(), node_id);
     ensure_directory_exist(storage_pth.as_str())?;
 
     let storage = HeedStorage::create(&storage_pth, &cfg, logger.clone())?;
@@ -202,7 +204,7 @@ pub async fn spawn_and_join_extra_node(
 pub async fn join_nodes(rafts: Vec<&Raft>, raft_addrs: Vec<&str>, peer_addr: &str) {
     let mut tickets = vec![];
     for (raft, raft_addr) in rafts.iter().zip(raft_addrs.into_iter()) {
-        let join_ticket = Raft::request_id(raft_addr.to_owned(), peer_addr.to_owned())
+        let join_ticket = Raft::request_id(raft_addr.to_owned(), peer_addr.to_owned(), None)
             .await
             .unwrap();
 

diff --git a/raftify-cli/src/commands/debug.rs b/raftify-cli/src/commands/debug.rs
@@ -102,7 +102,8 @@ pub fn debug_persitsted_all<LogStorage: StableStorage>(path_str: &str, logger: s
 }
 
 pub async fn debug_node(addr: &str) -> Result<()> {
-    let mut client = create_client(&addr).await?;
+    // TODO: Support TLS configuration
+    let mut client = create_client(&addr, None).await?;
     let response = client.debug_node(raft_service::Empty {}).await?;
     let json = response.into_inner().result_json;
     let parsed: HashMap<String, Value> = serde_json::from_str(&json).unwrap();