review comments

data/error_policies/resource_trans.cas

@@ -5,8 +5,8 @@ resource foo {
     resource_transition(foo, bbb, bar, [file]);
     resource_transition(foo, zap, ccc, [file]);
 
-	// Policies must include at least one av rule
-	allow(domain, foo, file, [read]);
+    // Policies must include at least one av rule
+    allow(domain, foo, file, [read]);
 }
 
 resource bar {}

data/policies/resource_trans.cas

@@ -1,8 +1,8 @@
 resource foo {
     resource_transition(this, domain, bar, [file dir]);
 
-	// Policies must include at least one av rule
-	allow(domain, foo, file, [read]);
+    // Policies must include at least one av rule
+    allow(domain, foo, file, [read]);
 }
 
 resource bar {}

src/internal_rep.rs

@@ -772,6 +772,18 @@ pub fn argument_to_typeinfo_vec<'a>(
     Ok(ret)
 }
 
+fn rename_cow<'a>(
+    cow_str: &CascadeString,
+    renames: &BTreeMap<String, String>,
+) -> Cow<'a, CascadeString> {
+    Cow::Owned(CascadeString::from(
+        renames
+            .get::<str>(cow_str.as_ref())
+            .unwrap_or(&cow_str.to_string())
+            .clone(),
+    ))
+}
+
 #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
 pub enum AvRuleFlavor {
     Allow,
@@ -792,18 +804,6 @@ pub struct AvRule<'a> {
 
 impl AvRule<'_> {
     fn get_renamed_statement(&self, renames: &BTreeMap<String, String>) -> Self {
-        fn rename_cow<'a>(
-            cow_str: &CascadeString,
-            renames: &BTreeMap<String, String>,
-        ) -> Cow<'a, CascadeString> {
-            Cow::Owned(CascadeString::from(
-                renames
-                    .get::<str>(cow_str.as_ref())
-                    .unwrap_or(&cow_str.to_string())
-                    .clone(),
-            ))
-        }
-
         AvRule {
             av_rule_flavor: self.av_rule_flavor,
             source: rename_cow(&self.source, renames),
@@ -1631,7 +1631,18 @@ pub struct ResourcetransRule<'a> {
     pub default: Cow<'a, CascadeString>,
     pub domain: Cow<'a, CascadeString>,
     pub parent: Cow<'a, CascadeString>,
-    pub file_type: FileType, // Should this be Cow too?
+    pub file_type: FileType,
+}
+
+impl ResourcetransRule<'_> {
+    fn get_renamed_statement(&self, renames: &BTreeMap<String, String>) -> Self {
+        ResourcetransRule {
+            default: rename_cow(&self.default, renames),
+            domain: rename_cow(&self.domain, renames),
+            parent: rename_cow(&self.parent, renames),
+            file_type: self.file_type,
+        }
+    }
 }
 
 impl From<&ResourcetransRule<'_>> for sexp::Sexp {
@@ -2406,9 +2417,9 @@ impl<'a> ValidatedStatement<'a> {
             ValidatedStatement::FcRule(f) => {
                 ValidatedStatement::FcRule(f.get_renamed_statement(renames))
             }
-            // Not 100% sure what to do here since we are dealing with everything as cascade strings
-            // like domtrans is.  With some testing it looks like nothing?
-            ValidatedStatement::ResourcetransRule(_) => self.clone(),
+            ValidatedStatement::ResourcetransRule(r) => {
+                ValidatedStatement::ResourcetransRule(r.get_renamed_statement(renames))
+            }
             // DomtransRule is probably broken on derive anyways. It uses TypeInfos directly rather
             // than strings.  This probably means that deriving a DomTrans using "this" is broken
             ValidatedStatement::DomtransRule(_) => self.clone(),