Merge remote-tracking branch 'origin/main' into release/current

Author: guillaumejparis

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "openbas-agent"
-version = "1.18.19"
+version = "1.18.20"
 edition = "2021"
 
 [dependencies]

installer/linux/agent-installer-session-user.sh

@@ -8,6 +8,7 @@ systemd_status=$(systemctl is-system-running)
 os=$(uname | tr '[:upper:]' '[:lower:]')
 install_dir="$HOME/${OPENBAS_INSTALL_DIR}"
 session_name="${OPENBAS_SERVICE_NAME}"
+systemd_unit_dir="$HOME/.config/systemd/user/"
 
 if [ "${os}" != "linux" ]; then
   echo "Operating system $OSTYPE is not supported yet, please create a ticket in openbas github project"
@@ -60,7 +61,8 @@ EOF
 
 echo "05. Starting agent service"
 (
-  ln -sf ${install_dir}/${session_name}.service $HOME/.config/systemd/user/
+  mkdir -p $systemd_unit_dir
+  ln -sf ${install_dir}/${session_name}.service $systemd_unit_dir
   systemctl --user daemon-reload
   systemctl --user enable ${session_name}
   systemctl --user start ${session_name}

src/main.rs

@@ -13,7 +13,7 @@ use std::env;
 use std::fs::create_dir_all;
 use std::ops::Deref;
 use std::panic;
-use std::path::{PathBuf};
+use std::path::PathBuf;
 use std::sync::atomic::AtomicBool;
 use std::thread::JoinHandle;
 

src/process/agent_cleanup.rs

@@ -15,7 +15,11 @@ static EXECUTING_MAX_TIME: u64 = 20; // 20 minutes
                                      // After X minutes define in this constant, all dir matching 'execution-' will be removed
 static DIRECTORY_MAX_TIME: u64 = 2880; // 2 days
 
-fn get_old_execution_directories(subfolder: &str, path: &str, since_minutes: u64) -> Result<Vec<DirEntry>, Error> {
+fn get_old_execution_directories(
+    subfolder: &str,
+    path: &str,
+    since_minutes: u64,
+) -> Result<Vec<DirEntry>, Error> {
     let now = SystemTime::now();
     let current_exe_patch = env::current_exe().unwrap();
     let executable_path = current_exe_patch.parent().unwrap();
@@ -64,7 +68,8 @@ pub fn clean() -> Result<JoinHandle<()>, Error> {
         // While no stop signal received
         while THREADS_CONTROL.load(Ordering::Relaxed) {
             let kill_runtimes_directories =
-                get_old_execution_directories("runtimes", "execution-", EXECUTING_MAX_TIME).unwrap();
+                get_old_execution_directories("runtimes", "execution-", EXECUTING_MAX_TIME)
+                    .unwrap();
             // region Handle killing old execution- directories
             for dir in kill_runtimes_directories {
                 let dir_path = dir.path();
@@ -91,7 +96,9 @@ pub fn clean() -> Result<JoinHandle<()>, Error> {
                 // After kill, rename from execution to executed
                 fs::rename(dirname, dirname.replace("execution", "executed")).unwrap();
             }
-            let rename_payloads_directories = get_old_execution_directories("payloads", "execution-", EXECUTING_MAX_TIME).unwrap();
+            let rename_payloads_directories =
+                get_old_execution_directories("payloads", "execution-", EXECUTING_MAX_TIME)
+                    .unwrap();
             for dir in rename_payloads_directories {
                 let dir_path = dir.path();
                 let dirname = dir_path.to_str().unwrap();

src/process/agent_exec.rs

@@ -10,7 +10,9 @@ use crate::common::error_model::Error;
 fn compute_working_dir(asset_agent_id: &str) -> PathBuf {
     let current_exe_patch = env::current_exe().unwrap();
     let executable_path = current_exe_patch.parent().unwrap();
-    executable_path.join("runtimes").join(format!("execution-{asset_agent_id}"))
+    executable_path
+        .join("runtimes")
+        .join(format!("execution-{asset_agent_id}"))
 }
 
 fn command_with_context(asset_agent_id: &str, command: &str) -> String {

src/tests/process/agent_exec_tests.rs

@@ -3,9 +3,9 @@ mod tests {
     use crate::process::agent_exec::command_execution;
     use std::env;
     use std::fs;
+    use std::fs::create_dir_all;
     use std::panic;
     use std::path::PathBuf;
-    use std::fs::create_dir_all;
 
     const TEST_AGENT_ID: &str = &"62e1e7a6-79af-47ae-ac4a-8324c2b82197";
     const CLEANUP_ENABLED: bool = true;
@@ -18,7 +18,9 @@ mod tests {
     fn cleanup_after_tests() {
         if CLEANUP_ENABLED {
             let working_dir = compute_working_dir();
-            let path = working_dir.join("runtimes").join(format!("execution-{}", TEST_AGENT_ID));
+            let path = working_dir
+                .join("runtimes")
+                .join(format!("execution-{}", TEST_AGENT_ID));
             let _ = fs::remove_dir_all(path);
         }
     }