Merge pull request #85 from LeChatP/dev

fix: more tests, and many fixes, some small feats (used for debug)

Author: LeChatP

.cargo/config.toml

@@ -26,7 +26,9 @@ coverage = [
     "tarpaulin",
     "--workspace",
     "--all-features",
-    "--all-targets",
+    "--bin", "dosr",
+    "--bin", "chsr",
+    "--lib",
     "--timeout",
     "120",
     "--exclude-files",
@@ -60,4 +62,7 @@ RAR_ENV_OVERRIDE_BEHAVIOR = "false"
 RAR_AUTHENTICATION = "perform"
 RAR_EXEC_INFO_DISPLAY = "hide"
 RAR_USER_CONSIDERED = "user"
-RAR_BOUNDING = "strict"
+RAR_BOUNDING = "strict"
+RAR_MAX_LOCKFILE_RETRIES = "10"
+RAR_LOCKFILE_RETRY_INTERVAL = "1"
+RAR_TIMEOUT_STORAGE = "/var/run/rar/ts"

.github/workflows/tests.yml

@@ -40,12 +40,31 @@ jobs:
 
     - name: Install Dependencies
       run: cargo xtask dependencies -dip sudo
-    
+
     - name: run integration coverage
-      run: sudo -E /usr/local/cargo/bin/cargo +nightly coverage
+      run: cargo +nightly coverage
+      env:
+        RAR_AUTHENTICATION: skip
+        RAR_CFG_PATH: target/rootasrole.json
+        RAR_MAX_LOCKFILE_RETRIES: 2
+        RAR_LOCKFILE_RETRY_INTERVAL: 300
+        SKIP_BUILD: true
+
+    - name: Upload coverage reports to Codecov
+      uses: codecov/codecov-action@v3
+      env: 
+        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+      with:
+        file: cobertura.xml
+        flags: unittests    
+
+    - name: run integration coverage as Root
+      run: sudo -E /usr/local/cargo/bin/cargo +nightly coverage --tests
       env:
         RAR_AUTHENTICATION: skip
         RAR_CFG_PATH: target/rootasrole.json
+        RAR_MAX_LOCKFILE_RETRIES: 2
+        RAR_LOCKFILE_RETRY_INTERVAL: 300
         SKIP_BUILD: true
 
     - name: Upload coverage reports to Codecov
@@ -54,4 +73,4 @@ jobs:
         CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
       with:
         file: cobertura.xml
-        flags: unittests
+        flags: admin-unittests

Cargo.lock

@@ -3,7 +3,7 @@ members = ["xtask", "rar-common"]
 
 [package]
 name = "rootasrole"
-version = "3.2.3"
+version = "3.2.4"
 rust-version = "1.83.0"
 authors = ["Eddie Billoir <[email protected]>"]
 edition = "2021"
@@ -68,7 +68,7 @@ unexpected_cfgs = { level = "allow", check-cfg = ['cfg(tarpaulin_include)'] }
 toml = { version = "0.8", default-features = false, features = ["parse", "display", "preserve_order"] }
 
 [dependencies]
-rar-common = { path = "rar-common", version = "3.2.3", package = "rootasrole-core" }
+rar-common = { path = "rar-common", version = "3.2.4", package = "rootasrole-core" }
 log = { version = "0.4", default-features = false, features = ["std"] }
 libc = { version = "0.2", default-features = false, features = ["std"]}
 strum = { version = "0.26", default-features = false, features = ["derive"] }

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rootasrole-core"
-version = "3.2.3"
+version = "3.2.4"
 edition = "2021"
 description = "This core crate for the RootAsRole project."
 license = "LGPL-3.0-or-later"
@@ -14,7 +14,7 @@ libc = { version= "0.2", default-features = false, features = ["std"] }
 strum = { version = "0.26", default-features = false, features = ["derive", "std"] }
 semver = { version = "1.0", default-features = false, features = ["std", "serde"] }
 nix = { version = "0.29", features = ["user","process", "signal", "fs", "hostname"] }
-capctl = { version= "0.2", default-features = false, features = ["std"] }
+capctl = { version= "0.2", default-features = false, features = ["std", "serde"] }
 pcre2 = { version = "0.2", default-features = false, optional = true }
 serde = { version = "1.0", default-features = false, features=["std", "rc", "derive"] }
 serde_json = { version= "1.0", default-features = false, features = ["std"] }
@@ -33,6 +33,7 @@ konst = { version= "0.3", default-features = false }
 [dev-dependencies]
 log = { version= "0.4", default-features = false }
 test-log = { version = "0.2", default-features = false }
+serde_test = "1.0"
 
 [build-dependencies]
 serde = { version = "1.0", default-features = false, features= ["rc", "derive"] }

rar-common/Cargo.toml

@@ -4,6 +4,7 @@ use std::{
 };
 
 use bon::bon;
+use log::debug;
 use nix::unistd::{Group, User};
 use serde::{Deserialize, Serialize};
 use serde_json::{Map, Value};
@@ -315,10 +316,18 @@ impl<'de> Deserialize<'de> for SGroups {
                 formatter.write_str("a string or a number")
             }
 
+            fn visit_newtype_struct<D>(self, deserializer: D) -> Result<Self::Value, D::Error>
+            where
+                D: serde::Deserializer<'de>,
+            {
+                deserializer.deserialize_any(self)
+            }
+
             fn visit_borrowed_str<E>(self, v: &'de str) -> Result<Self::Value, E>
             where
                 E: serde::de::Error,
             {
+                debug!("SGroups: visit_borrowed_str: {}", v);
                 if let Ok(group) = v.parse() {
                     Ok(SGroups::Single(SGroupType(SGenericActorType::Id(group))))
                 } else {
@@ -332,6 +341,7 @@ impl<'de> Deserialize<'de> for SGroups {
             where
                 E: serde::de::Error,
             {
+                debug!("SGroups: visit_str: {}", v);
                 if let Ok(group) = v.parse() {
                     Ok(SGroups::Single(SGroupType(SGenericActorType::Id(group))))
                 } else {
@@ -345,6 +355,7 @@ impl<'de> Deserialize<'de> for SGroups {
             where
                 E: serde::de::Error,
             {
+                debug!("SGroups: visit_string: {}", v);
                 if let Ok(group) = v.parse() {
                     Ok(SGroups::Single(SGroupType(SGenericActorType::Id(group))))
                 } else {
@@ -356,6 +367,7 @@ impl<'de> Deserialize<'de> for SGroups {
             where
                 E: serde::de::Error,
             {
+                debug!("SGroups: visit_u64: {}", value);
                 if value > u32::MAX as u64 {
                     return Err(E::custom("value is too large"));
                 }
@@ -368,6 +380,7 @@ impl<'de> Deserialize<'de> for SGroups {
             where
                 A: serde::de::SeqAccess<'de>,
             {
+                debug!("SGroups: visit_seq");
                 let mut groups = Vec::new();
                 while let Some(group) = seq.next_element::<SGroupType>()? {
                     groups.push(group);