Merge branch 'reorganisation' of github.com:LeChatP/RootAsRole into r…

…eorganisation
LeChatP · Sep 10, 2024 · 80dd903 · 80dd903
2 parents 880b8fc + cdfb1f1
commit 80dd903
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 26 deletions.
diff --git a/rar-common/src/database/options.rs b/rar-common/src/database/options.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
-use std::{borrow::Borrow, cell::RefCell, rc::Rc};
 #[cfg(feature = "finder")]
 use std::path::PathBuf;
+use std::{borrow::Borrow, cell::RefCell, rc::Rc};
 
 use chrono::Duration;
 
@@ -551,18 +551,18 @@ pub struct OptStack {
 }
 
 type FinalPath = (
-        PathBehavior,
-        Rc<RefCell<LinkedHashSet<String>>>,
-        Rc<RefCell<LinkedHashSet<String>>>,
-    );
+    PathBehavior,
+    Rc<RefCell<LinkedHashSet<String>>>,
+    Rc<RefCell<LinkedHashSet<String>>>,
+);
 
 type FinalEnv = (
-        EnvBehavior,
-        HashMap<String, String>,
-        LinkedHashSet<EnvKey>,
-        LinkedHashSet<EnvKey>,
-        LinkedHashSet<EnvKey>,
-    );
+    EnvBehavior,
+    HashMap<String, String>,
+    LinkedHashSet<EnvKey>,
+    LinkedHashSet<EnvKey>,
+    LinkedHashSet<EnvKey>,
+);
 
 impl OptStack {
     pub fn from_task(task: Rc<RefCell<STask>>) -> Self {
@@ -610,7 +610,7 @@ impl OptStack {
 
     fn new(roles: Rc<RefCell<SConfig>>) -> OptStack {
         let mut res = OptStack::default();
-        let mut opt = Opt{
+        let mut opt = Opt {
             level: Level::Global,
             root: Some(SPrivileged::User),
             bounding: Some(SBounding::Strict),
@@ -696,9 +696,7 @@ impl OptStack {
         }
     }
 
-    fn get_final_path(
-        &self,
-    ) -> FinalPath {
+    fn get_final_path(&self) -> FinalPath {
         let mut final_behavior = PathBehavior::Delete;
         let final_add = rc_refcell!(LinkedHashSet::new());
         // Cannot use HashSet as we need to keep order
@@ -747,9 +745,7 @@ impl OptStack {
 
     #[allow(dead_code)]
     #[cfg(not(tarpaulin_include))]
-    fn union_all_path(
-        &self,
-    ) -> FinalPath {
+    fn union_all_path(&self) -> FinalPath {
         let mut final_behavior = PathBehavior::Delete;
         let final_add = rc_refcell!(LinkedHashSet::new());
         // Cannot use HashSet as we need to keep order
@@ -877,9 +873,7 @@ impl OptStack {
         Ok(final_env)
     }
 
-    fn get_final_env(
-        &self,
-    ) -> FinalEnv {
+    fn get_final_env(&self) -> FinalEnv {
         let mut final_behavior = EnvBehavior::default();
         let mut final_set = HashMap::new();
         let mut final_keep = LinkedHashSet::new();

diff --git a/rar-common/src/util.rs b/rar-common/src/util.rs
@@ -16,9 +16,9 @@ use strum::EnumIs;
 use tracing::{debug, warn, Level};
 use tracing_subscriber::util::SubscriberInitExt;
 
-use crate::database::structs::SCommand;
 #[cfg(feature = "finder")]
 use crate::api::PluginManager;
+use crate::database::structs::SCommand;
 
 pub const RST: &str = "\x1B[0m";
 pub const BOLD: &str = "\x1B[1m";

diff --git a/src/chsr/cli/mod.rs b/src/chsr/cli/mod.rs
@@ -72,9 +72,13 @@ mod tests {
             .try_init();
         //Write json test json file
         let path = format!("{}.{}", ROOTASROLE, name);
-        let mut file = std::fs::File::create(path.clone()).unwrap_or_else(|_| panic!("Failed to create {:?}/{} file at",
+        let mut file = std::fs::File::create(path.clone()).unwrap_or_else(|_| {
+            panic!(
+                "Failed to create {:?}/{} file at",
                 current_dir().unwrap(),
-                path));
+                path
+            )
+        });
         let mut settings = SettingsFile::default();
         settings.storage.method = StorageMethod::JSON;
         settings.storage.settings = Some(RemoteStorageSettings::default());

diff --git a/src/sr/main.rs b/src/sr/main.rs
@@ -267,7 +267,11 @@ fn main() -> Result<(), Box<dyn Error>> {
 
     let pty = Pty::new().expect("Failed to create pty");
 
-    debug!("Command: {:?} {:?}", execcfg.exec_path, execcfg.exec_args.join(" "));
+    debug!(
+        "Command: {:?} {:?}",
+        execcfg.exec_path,
+        execcfg.exec_args.join(" ")
+    );
     let command = Command::new(&execcfg.exec_path)
         .args(execcfg.exec_args.iter())
         .env_clear()
@@ -319,7 +323,6 @@ fn make_cred() -> Cred {
     // get parent pid
     let ppid = nix::unistd::getppid();
 
-
     Cred {
         user,
         groups,