fix: build blockers

Author: LeChatP

.github/workflows/tests.yml

@@ -29,7 +29,7 @@ jobs:
       run: cargo xtask dependencies -dip sudo
 
     - name: build integration coverage
-      run: sudo -E cargo +nightly coverage --out Xml
+      run: sudo -E /usr/local/cargo/bin/cargo +nightly coverage --out Xml
       env:
         RAR_AUTHENTICATION: skip
         RAR_CFG_PATH: target/rootasrole.json

rar-common/src/database/actor.rs

@@ -243,6 +243,30 @@ impl<'de: 'a, 'a> Deserialize<'de> for DGroups<'a> {
                 }
             }
 
+            fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
+                where
+                    E: serde::de::Error, {
+                if let Ok(group) = v.parse() {
+                    return Ok(DGroups::Single(DGroupType(DGenericActorType::Id(group))));
+                } else {
+                    return Ok(DGroups::Single(DGroupType(DGenericActorType::Name(
+                        Cow::Owned(v.to_string()),
+                    ))));
+                }
+            }
+
+            fn visit_string<E>(self, v: String) -> Result<Self::Value, E>
+                where
+                    E: serde::de::Error, {
+                if let Ok(group) = v.parse() {
+                    return Ok(DGroups::Single(DGroupType(DGenericActorType::Id(group))));
+                } else {
+                    return Ok(DGroups::Single(DGroupType(DGenericActorType::Name(
+                        v.into(),
+                    ))));
+                }
+            }
+
             fn visit_u64<E>(self, value: u64) -> Result<Self::Value, E>
             where
                 E: serde::de::Error,
@@ -302,6 +326,30 @@ impl<'de: 'a, 'a> Deserialize<'de> for SGroups {
                 }
             }
 
+            fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
+                where
+                    E: serde::de::Error, {
+                if let Ok(group) = v.parse() {
+                    return Ok(SGroups::Single(SGroupType(SGenericActorType::Id(group))));
+                } else {
+                    return Ok(SGroups::Single(SGroupType(SGenericActorType::Name(
+                        v.into(),
+                    ))));
+                }
+            }
+
+            fn visit_string<E>(self, v: String) -> Result<Self::Value, E>
+                where
+                    E: serde::de::Error, {
+                if let Ok(group) = v.parse() {
+                    return Ok(SGroups::Single(SGroupType(SGenericActorType::Id(group))));
+                } else {
+                    return Ok(SGroups::Single(SGroupType(SGenericActorType::Name(
+                        v,
+                    ))));
+                }
+            }
+
             fn visit_u64<E>(self, value: u64) -> Result<Self::Value, E>
             where
                 E: serde::de::Error,

rar-common/src/database/de.rs

@@ -251,6 +251,18 @@ impl<'de> Deserialize<'de> for SCommands {
                 formatter.write_str("a string or a number")
             }
 
+            fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
+                where
+                    E: de::Error, {
+                let set = SetBehavior::from_str(v).map_err(de::Error::custom)?;
+                Ok(SCommands {
+                    default_behavior: Some(set),
+                    add: Vec::new(),
+                    sub: Vec::new(),
+                    _extra_fields: Map::new(),
+                })
+            }
+
             fn visit_string<E>(self, v: String) -> Result<Self::Value, E>
             where
                 E: de::Error,

src/sr/pam/mod.rs

@@ -48,7 +48,7 @@ impl SrConversationHandler {
             no_interact: false,
         }
     }
-    fn open(&self) -> std::io::Result<Terminal> {
+    fn open(&self) -> std::io::Result<Terminal<'_>> {
         if self.use_stdin {
             Terminal::open_stdie()
         } else {