Update to generate is operator

Generators may generate `is` based on an `enable_is` flag. This is disabled for differential testing because `is` is not modeled in dafny, but it is enabled for property tests.
cedar-policy · Nov 8, 2023 · 25b4f31 · 25b4f31
1 parent b7c637a
commit 25b4f31
Show file tree

Hide file tree

Showing 15 changed files with 47 additions and 0 deletions.
diff --git a/cedar-drt/fuzz/fuzz_targets/abac-type-directed.rs b/cedar-drt/fuzz/fuzz_targets/abac-type-directed.rs
@@ -61,6 +61,7 @@ const SETTINGS: ABACSettings = ABACSettings {
     max_width: 3,
     enable_additional_attributes: false,
     enable_like: true,
+    enable_is: false,
     enable_action_groups_and_attrs: true,
     enable_arbitrary_func_call: true,
     enable_unknowns: false,

diff --git a/cedar-drt/fuzz/fuzz_targets/abac.rs b/cedar-drt/fuzz/fuzz_targets/abac.rs
@@ -57,6 +57,7 @@ const SETTINGS: ABACSettings = ABACSettings {
     max_width: 7,
     enable_additional_attributes: false,
     enable_like: true,
+    enable_is: false,
     // ABAC fuzzing restricts the use of action because it is used to generate
     // the corpus tests which will be run on Cedar and CedarCLI.
     // These packages only expose the restricted action behavior.

diff --git a/cedar-drt/fuzz/fuzz_targets/eval-type-directed.rs b/cedar-drt/fuzz/fuzz_targets/eval-type-directed.rs
@@ -58,6 +58,7 @@ const SETTINGS: ABACSettings = ABACSettings {
     max_width: 3,
     enable_additional_attributes: false,
     enable_like: true,
+    enable_is: false,
     enable_action_groups_and_attrs: true,
     enable_arbitrary_func_call: true,
     enable_unknowns: false,

diff --git a/cedar-drt/fuzz/fuzz_targets/formatter.rs b/cedar-drt/fuzz/fuzz_targets/formatter.rs
@@ -45,6 +45,7 @@ const SETTINGS: ABACSettings = ABACSettings {
     max_width: 7,
     enable_additional_attributes: true,
     enable_like: true,
+    enable_is: true,
     enable_action_groups_and_attrs: true,
     enable_arbitrary_func_call: false,
     enable_unknowns: false,

diff --git a/cedar-drt/fuzz/fuzz_targets/partial-eval.rs b/cedar-drt/fuzz/fuzz_targets/partial-eval.rs
@@ -63,6 +63,7 @@ const SETTINGS: ABACSettings = ABACSettings {
     max_width: 3,
     enable_additional_attributes: false,
     enable_like: true,
+    enable_is: true,
     enable_action_groups_and_attrs: true,
     enable_arbitrary_func_call: true,
     enable_unknowns: true,

diff --git a/cedar-drt/fuzz/fuzz_targets/pp.rs b/cedar-drt/fuzz/fuzz_targets/pp.rs
@@ -43,6 +43,7 @@ const SETTINGS: ABACSettings = ABACSettings {
     max_width: 7,
     enable_additional_attributes: true,
     enable_like: true,
+    enable_is: true,
     enable_action_groups_and_attrs: true,
     enable_arbitrary_func_call: false,
     enable_unknowns: false,

diff --git a/cedar-drt/fuzz/fuzz_targets/strict-validation-drt-type-directed.rs b/cedar-drt/fuzz/fuzz_targets/strict-validation-drt-type-directed.rs
@@ -41,6 +41,7 @@ const SETTINGS: ABACSettings = ABACSettings {
     max_width: 7,
     enable_additional_attributes: true,
     enable_like: true,
+    enable_is: false,
     enable_action_groups_and_attrs: true,
     enable_arbitrary_func_call: true,
     enable_unknowns: false,

diff --git a/cedar-drt/fuzz/fuzz_targets/validation-drt-type-directed.rs b/cedar-drt/fuzz/fuzz_targets/validation-drt-type-directed.rs
@@ -41,6 +41,7 @@ const SETTINGS: ABACSettings = ABACSettings {
     max_width: 7,
     enable_additional_attributes: true,
     enable_like: true,
+    enable_is: false,
     enable_action_groups_and_attrs: true,
     enable_arbitrary_func_call: true,
     enable_unknowns: false,

diff --git a/cedar-drt/fuzz/fuzz_targets/validation-drt.rs b/cedar-drt/fuzz/fuzz_targets/validation-drt.rs
@@ -41,6 +41,7 @@ const SETTINGS: ABACSettings = ABACSettings {
     max_width: 7,
     enable_additional_attributes: true,
     enable_like: true,
+    enable_is: false,
     enable_action_groups_and_attrs: true,
     enable_arbitrary_func_call: true,
     enable_unknowns: false,

diff --git a/cedar-drt/fuzz/fuzz_targets/validation-pbt.rs b/cedar-drt/fuzz/fuzz_targets/validation-pbt.rs
@@ -61,6 +61,7 @@ const SETTINGS: ABACSettings = ABACSettings {
     max_width: 7,
     enable_additional_attributes: true,
     enable_like: true,
+    enable_is: true,
     enable_action_groups_and_attrs: true,
     enable_arbitrary_func_call: true,
     enable_unknowns: false,
@@ -143,6 +144,9 @@ fn log_err<T>(res: Result<T>, doing_what: &str) -> Result<T> {
             Err(Error::LikeDisabled) => {
                 checkpoint(LOG_FILENAME_ERR_LIKE_DISABLED.to_string() + "_" + doing_what)
             }
+            Err(Error::IsDisabled) => {
+                checkpoint(LOG_FILENAME_ERR_LIKE_DISABLED.to_string() + "_" + doing_what)
+            }
             Err(Error::IncorrectFormat {
                 doing_what: doing_2,
             }) => checkpoint(

diff --git a/cedar-policy-generators/src/err.rs b/cedar-policy-generators/src/err.rs
@@ -39,6 +39,9 @@ pub enum Error {
     /// Tried to generate something using the `like` operator, but the `like`
     /// operator was disabled in settings
     LikeDisabled,
+    /// Tried to generate something using the `is` operator, but the `is`
+    /// operator was disabled in settings
+    IsDisabled,
     /// `IncorrectFormat` error that was generated by the `arbitrary` crate directly.
     /// We try to maintain the invariant that we don't generate these ourselves,
     /// preferring the more specific errors above
@@ -67,6 +70,7 @@ impl From<Error> for arbitrary::Error {
             Error::NoValidPrincipalOrResourceTypes => arbitrary::Error::IncorrectFormat,
             Error::ExtensionsDisabled => arbitrary::Error::IncorrectFormat,
             Error::LikeDisabled => arbitrary::Error::IncorrectFormat,
+            Error::IsDisabled => arbitrary::Error::IncorrectFormat,
             Error::EntitiesError(_) => arbitrary::Error::IncorrectFormat,
             Error::IncorrectFormat { .. } => arbitrary::Error::IncorrectFormat,
             Error::OtherArbitrary(e) => e,

diff --git a/cedar-policy-generators/src/expr.rs b/cedar-policy-generators/src/expr.rs
@@ -146,6 +146,16 @@ impl<'a> ExprGenerator<'a> {
                             Err(Error::LikeDisabled)
                         }
                     },
+                    1 => {
+                        if self.settings.enable_is {
+                            Ok(ast::Expr::is_entity_type(
+                                self.generate_expr(max_depth - 1, u)?,
+                                u.choose(&self.schema.entity_types)?.clone(),
+                            ))
+                        } else {
+                            Err(Error::IsDisabled)
+                        }
+                    },
                     1 => {
                         let mut l = Vec::new();
                         u.arbitrary_loop(Some(0), Some(self.settings.max_width as u32), |u| {
@@ -472,6 +482,21 @@ impl<'a> ExprGenerator<'a> {
                                 Err(Error::LikeDisabled)
                             }
                         },
+                        // is
+                        2 => {
+                            if self.settings.enable_is {
+                                Ok(ast::Expr::is_entity_type(
+                                    self.generate_expr_for_type(
+                                        &Type::entity(),
+                                        max_depth - 1,
+                                        u,
+                                    )?,
+                                    u.choose(&self.schema.entity_types)?.clone(),
+                                ))
+                            } else {
+                                Err(Error::LikeDisabled)
+                            }
+                        },
                         // extension function that returns bool
                         2 => self.generate_ext_func_call_for_type(
                             &Type::bool(),

diff --git a/cedar-policy-generators/src/main.rs b/cedar-policy-generators/src/main.rs
@@ -57,6 +57,7 @@ impl From<&HierarchyArgs> for ABACSettings {
             max_width: value.max_width,
             enable_additional_attributes: false,
             enable_like: true,
+            enable_is: true,
             enable_action_groups_and_attrs: true,
             enable_arbitrary_func_call: false,
             enable_unknowns: false,

diff --git a/cedar-policy-generators/src/schema.rs b/cedar-policy-generators/src/schema.rs
@@ -1280,6 +1280,7 @@ mod tests {
         max_width: 4,
         enable_additional_attributes: false,
         enable_like: false,
+        enable_is: false,
         enable_action_groups_and_attrs: true,
         enable_arbitrary_func_call: false,
         enable_unknowns: false,

diff --git a/cedar-policy-generators/src/settings.rs b/cedar-policy-generators/src/settings.rs
@@ -55,6 +55,9 @@ pub struct ABACSettings {
     /// Flag to globally enable/disable generation of expressions containing the
     /// `like` operator.
     pub enable_like: bool,
+    /// Flag to globally enable/disable generation of expressions containing the
+    /// `is` operator.
+    pub enable_is: bool,
     /// Flag to enable/disable generating actions in groups and declaring
     /// attributes on entity types.
     pub enable_action_groups_and_attrs: bool,