+ switch logger for avoid ub

milieuim · Nov 19, 2024 · 6d393ef · 6d393ef
1 parent 3236850
commit 6d393ef
Show file tree

Hide file tree

Showing 12 changed files with 148 additions and 284 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,19 +11,20 @@ path = "src/lib.rs"
 age = { git = "https://github.com/str4d/rage.git",rev = "baf277a749c839e49f93bffb58d36734ac94be83", features = ["ssh", "plugin"]}
 argh = "0.1.12"
 blake3 = "1.5.4"
+colog = "1.3.0"
 console = "0.15.8"
 edit = "0.1.5"
 eyre = "0.6.12"
 hex = "0.4.3"
 hex-literal = "0.4.1"
 libc = "0.2.158"
+log = "0.4.22"
 nom = "7.1.3"
 pinentry = "0.5.1"
 rpassword = "7.3.1"
 serde = "1.0.210"
 serde_json = "1.0.132"
 sha2 = "0.10.8"
-spdlog-rs = "0.3.13"
 subtle = "2.6.1"
 sys-mount = "3.0.1"
 

diff --git a/dev/test.nix b/dev/test.nix
@@ -72,7 +72,7 @@
                     };
 
                     # for vm testing log
-                    systemd.services.vaultix-activate.serviceConfig.Environment = [ "SPDLOG_RS_LEVEL=trace" ];
+                    systemd.services.vaultix-activate.serviceConfig.Environment = [ "RUST_LOG=trace" ];
                   }
                 )
 
@@ -128,7 +128,7 @@
                   };
 
                   # for vm testing log
-                  systemd.services.vaultix-activate.serviceConfig.Environment = [ "SPDLOG_RS_LEVEL=trace" ];
+                  systemd.services.vaultix-activate.serviceConfig.Environment = [ "RUST_LOG=trace" ];
                 })
 
                 ./configuration.nix
@@ -172,7 +172,7 @@
                   };
 
                   # for vm testing log
-                  systemd.services.vaultix-activate.serviceConfig.Environment = [ "SPDLOG_RS_LEVEL=trace" ];
+                  systemd.services.vaultix-activate.serviceConfig.Environment = [ "RUST_LOG=trace" ];
                 })
 
                 ./configuration.nix

diff --git a/src/cmd/check.rs b/src/cmd/check.rs
@@ -1,5 +1,5 @@
 use eyre::Result;
-use spdlog::{debug, error};
+use log::{debug, error};
 
 use crate::{
     helper::stored::{InStore, SecMap, SecPath},

diff --git a/src/cmd/deploy.rs b/src/cmd/deploy.rs
@@ -20,7 +20,7 @@ use age::Recipient;
 use eyre::{eyre, Context, ContextCompat, Result};
 use hex::decode;
 use lib::extract_all_hashes;
-use spdlog::{debug, error, info, trace};
+use log::{debug, error, info};
 use sys_mount::{Mount, MountFlags, SupportedFilesystems};
 
 impl HostKey {
@@ -191,7 +191,7 @@ impl Profile {
                     ret
                 } else {
                     if PathBuf::from($obj.path()).starts_with(&default_path) {
-                        spdlog::warn!(
+                        log::warn!(
                             "extract to decryptedDir detected. recommend specify `name` instead of `path`."
                         );
                     }
@@ -256,7 +256,7 @@ impl Profile {
                         })
                         .for_each(|(k, v)| {
                             // render and insert
-                            trace!("template before process: {}", template);
+                            log::trace!("template before process: {}", template);
 
                             let raw_composed_insertial = String::from_utf8_lossy(v).to_string();
 
@@ -290,11 +290,6 @@ impl Profile {
         } else {
             self.decrypted_dir()
         };
-        info!(
-            "link decrypted dir {} to {}",
-            target_extract_dir_with_gen.display(),
-            symlink_dst
-        );
 
         match std::fs::remove_file(symlink_dst) {
             Err(e) if e.kind() == io::ErrorKind::NotFound => {}
@@ -303,7 +298,12 @@ impl Profile {
                 debug!("old symlink removed");
             }
         }
-        // link back to /run/vaultix*
+
+        info!(
+            "linking decrypted dir {} to {}",
+            target_extract_dir_with_gen.display(),
+            symlink_dst
+        );
         std::os::unix::fs::symlink(target_extract_dir_with_gen, symlink_dst)
             .wrap_err_with(|| "create symlink error")
     }

diff --git a/src/cmd/edit.rs b/src/cmd/edit.rs
@@ -14,8 +14,8 @@ use crate::helper::{
 
 use age::Recipient;
 use eyre::{eyre, Context, ContextCompat};
+use log::info;
 use nom::AsBytes;
-use spdlog::info;
 
 use super::EditSubCmd;
 

diff --git a/src/cmd/mod.rs b/src/cmd/mod.rs
@@ -1,7 +1,7 @@
 use std::{fs, path::PathBuf};
 
 use eyre::{eyre, Context, ContextCompat};
-use spdlog::prelude::*;
+use log::{debug, info};
 use {argh::FromArgs, std::fmt::Debug};
 
 mod check;

diff --git a/src/cmd/renc.rs b/src/cmd/renc.rs
@@ -1,5 +1,5 @@
 use eyre::{eyre, Context, Result};
-use spdlog::{debug, error, info};
+use log::{debug, error, info};
 use std::{fs, path::PathBuf};
 
 use crate::{

diff --git a/src/helper/secret_buf.rs b/src/helper/secret_buf.rs
@@ -6,8 +6,6 @@ use std::rc::Rc;
 use std::{io::Read, iter, marker::PhantomData};
 
 use age::{Identity, Recipient};
-use spdlog::debug;
-
 #[derive(Debug, Clone)]
 pub struct AgeEnc;
 #[derive(Debug, Clone)]
@@ -71,6 +69,7 @@ impl SecBuf<AgeEnc> {
     }
 }
 use eyre::eyre;
+use log::debug;
 
 use super::set_owner_group;
 

diff --git a/src/helper/set_owner_group.rs b/src/helper/set_owner_group.rs
@@ -1,6 +1,6 @@
 use eyre::{eyre, Result};
 use libc::{fchown, getgrnam, getpwnam};
-use spdlog::warn;
+use log::warn;
 use std::{ffi::CString, fs::File, os::fd::AsRawFd};
 
 pub fn set_owner_and_group(file: &File, owner: &str, group: &str) -> Result<()> {

diff --git a/src/helper/stored.rs b/src/helper/stored.rs
@@ -7,15 +7,14 @@ use std::{
     rc::Rc,
 };
 
-use age::{Identity, Recipient};
-use eyre::Context;
-use spdlog::{debug, trace};
-
 use crate::{
     helper::secret_buf::{AgeEnc, SecBuf},
     profile::{self, Secret, SecretSet},
 };
+use age::{Identity, Recipient};
+use eyre::Context;
 use eyre::{eyre, Result};
+use log::{debug, trace};
 use std::marker::PhantomData;
 
 use super::secret_buf::HostEnc;

diff --git a/src/main.rs b/src/main.rs
@@ -1,26 +1,15 @@
 #![feature(iterator_try_collect)]
 use cmd::Args;
 use eyre::Result;
-use spdlog::formatter::{pattern, PatternFormatter};
 
 mod cmd;
 mod helper;
 mod interop;
 mod parser;
 mod profile;
-use std::os::unix::process::parent_id;
 
 fn main() -> Result<()> {
-    let _ = spdlog::init_env_level();
-    let as_sd_unit = parent_id() == 1;
-    if as_sd_unit {
-        for sink in spdlog::default_logger().sinks() {
-            sink.set_formatter(Box::new(PatternFormatter::new(pattern!(
-                "{^{level}} - {payload}{eol}"
-            ))))
-        }
-        spdlog::debug!("Detected running as systemd unit");
-    }
+    colog::init();
     let args: Args = argh::from_env();
     args.ayaya()
 }