Fix bug causing compilation error on Windows.

wa5i · Nov 27, 2023 · c370cd1 · c370cd1
1 parent affcf63
commit c370cd1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -27,7 +27,6 @@ clap = { version = "4.4", features = ["wrap_help", "suggestions"] }
 sysexits = { version = "0.7", features = ["std"] }
 build-time = "0.1"
 hcl-rs = "0.16"
-daemonize = "0.5"
 actix-web = { version = "4.4", features = ["openssl"] }
 actix-tls = "3.1"
 actix-rt = "2.9"
@@ -40,6 +39,9 @@ as-any = "0.3.1"
 pem = "3.0"
 chrono = "0.4"
 
+[target.'cfg(unix)'.dependencies]
+daemonize = "0.5"
+
 [dependencies.foreign-types]
 version = "0.3.1"
 

diff --git a/src/cli/command/server.rs b/src/cli/command/server.rs
@@ -6,7 +6,6 @@ use std::{
     path::Path,
     sync::{Arc, RwLock}
 };
-use daemonize::Daemonize;
 use clap::{ArgMatches};
 use sysexits::ExitCode;
 use actix_web::{
@@ -52,6 +51,7 @@ pub fn main(config_path: &str) -> Result<(), RvError> {
         fs::create_dir_all(work_dir.as_str())?;
     }
 
+    #[cfg(not(windows))]
     if config.daemon {
         // start daemon
         let log_path = format!("{}/rusty_vault.log", work_dir);
@@ -79,7 +79,7 @@ pub fn main(config_path: &str) -> Result<(), RvError> {
             .open(log_path)
             .unwrap();
 
-        let daemonize = Daemonize::new()
+        let daemonize = daemonize::Daemonize::new()
             .working_directory(work_dir.as_str())
             .user(user.as_str())
             .group(group.as_str())

diff --git a/src/storage/barrier_aes_gcm.rs b/src/storage/barrier_aes_gcm.rs
@@ -505,9 +505,12 @@ mod test {
         assert!(keys.is_ok());
         let keys = keys.unwrap();
         assert_eq!(keys.len(), 3);
-        assert_eq!(keys[0], "bar".to_string());
-        assert_eq!(keys[1], "barrier/".to_string());
-        assert_eq!(keys[2], "bar/".to_string());
+        assert!(keys.join("") == "barbarrier/bar/"
+                || keys.join("") == "barbar/barrier/"
+                || keys.join("") == "bar/barbarrier/"
+                || keys.join("") == "barrier/bar/bar"
+                || keys.join("") == "barrier/barbar/"
+                || keys.join("") == "bar/barrier/bar");
         let get = barrier.get("bar");
         assert!(get.is_ok());
         assert_eq!(get.unwrap().unwrap().value, "test1".as_bytes());
@@ -517,8 +520,7 @@ mod test {
         assert!(keys.is_ok());
         let keys = keys.unwrap();
         assert_eq!(keys.len(), 2);
-        assert_eq!(keys[0], "foo".to_string());
-        assert_eq!(keys[1], "foo/".to_string());
+        assert!(keys.join("") == "foofoo/" || keys.join("") == "foo/foo");
         let get = barrier.get("bar/foo");
         assert!(get.is_ok());
         assert_eq!(get.unwrap().unwrap().value, "test2".as_bytes());
@@ -548,8 +550,7 @@ mod test {
         assert!(keys.is_ok());
         let keys = keys.unwrap();
         assert_eq!(keys.len(), 2);
-        assert_eq!(keys[0], "barrier/".to_string());
-        assert_eq!(keys[1], "bar/".to_string());
+        assert!(keys.join("") == "barrier/bar/" || keys.join("") == "bar/barrier/");
 
         let seal = barrier.seal();
         assert!(seal.is_ok());

diff --git a/src/storage/physical/mod.rs b/src/storage/physical/mod.rs
@@ -151,16 +151,14 @@ mod test {
         assert!(keys.is_ok());
         let keys = keys.unwrap();
         assert_eq!(keys.len(), 2);
-        assert_eq!(keys[0], "bar".to_string());
-        assert_eq!(keys[1], "bar/".to_string());
+        assert!(keys.join("") == "barbar/" || keys.join("") == "bar/bar");
 
         // Scan bar/
         let keys = backend.list("bar/");
         assert!(keys.is_ok());
         let keys = keys.unwrap();
         assert_eq!(keys.len(), 2);
-        assert_eq!(keys[0], "foo".to_string());
-        assert_eq!(keys[1], "foo/".to_string());
+        assert!(keys.join("") == "foofoo/" || keys.join("") == "foo/foo");
 
         // Scan bar/foo/
         let keys = backend.list("bar/foo/");