Merge pull request #123 from Cosmian/fix/access_policy

fix: access policy parsing

.gitignore

@@ -4,3 +4,5 @@
 /*.sh
 /.vscode
 Cargo.lock
+**/.#*
+**/#*#

benches/benches.rs

@@ -21,7 +21,7 @@ fn policy() -> Result<Policy, Error> {
             DimensionBuilder::new(
                 "Department",
                 vec![
-                    ("R&D", EncryptionHint::Classic),
+                    ("RD", EncryptionHint::Classic),
                     ("HR", EncryptionHint::Classic),
                     ("MKG", EncryptionHint::Classic),
                     ("FIN", EncryptionHint::Classic),
@@ -46,7 +46,7 @@ fn policy() -> Result<Policy, Error> {
             DimensionBuilder::new(
                 "Department",
                 vec![
-                    ("R&D", EncryptionHint::Hybridized),
+                    ("RD", EncryptionHint::Hybridized),
                     ("HR", EncryptionHint::Hybridized),
                     ("MKG", EncryptionHint::Hybridized),
                     ("FIN", EncryptionHint::Hybridized),
@@ -118,16 +118,13 @@ fn get_access_policies() -> (Vec<AccessPolicy>, Vec<AccessPolicy>) {
     // Access policy with 1 partition
     #[allow(unused_mut)]
     let mut access_policies =
-        vec![
-            AccessPolicy::from_boolean_expression("Department::FIN && Security Level::Protected")
-                .unwrap(),
-        ];
+        vec![AccessPolicy::parse("Department::FIN && Security Level::Protected").unwrap()];
 
     #[cfg(feature = "full_bench")]
     {
         // Access policy with 2 partition
         access_policies.push(
-            AccessPolicy::from_boolean_expression(
+            AccessPolicy::parse(
                 "(Department::FIN && Security Level::Protected) || (Department::HR && Security \
                  Level::Confidential)",
             )
@@ -136,7 +133,7 @@ fn get_access_policies() -> (Vec<AccessPolicy>, Vec<AccessPolicy>) {
 
         // Access policy with 3 partition
         access_policies.push(
-            AccessPolicy::from_boolean_expression(
+            AccessPolicy::parse(
                 "(Department::FIN && Security Level::Protected) || ((Department::HR || \
                  Department::MKG) && Security Level::Confidential)",
             )
@@ -145,18 +142,18 @@ fn get_access_policies() -> (Vec<AccessPolicy>, Vec<AccessPolicy>) {
 
         // Access policy with 4 partition
         access_policies.push(
-            AccessPolicy::from_boolean_expression(
+            AccessPolicy::parse(
                 "(Department::FIN && Security Level::Protected) || ((Department::HR || \
-                 Department::MKG || Department::R&D) && Security Level::Confidential)",
+                 Department::MKG || Department::RD) && Security Level::Confidential)",
             )
             .unwrap(),
         );
 
         // Access policy with 5 partition
         access_policies.push(
-            AccessPolicy::from_boolean_expression(
+            AccessPolicy::parse(
                 "(Department::FIN && Security Level::Protected) || ((Department::HR || \
-                 Department::MKG || Department::R&D) && Security Level::Confidential) || \
+                 Department::MKG || Department::RD) && Security Level::Confidential) || \
                  (Department::HR && Security Level::Top Secret)",
             )
             .unwrap(),
@@ -167,36 +164,33 @@ fn get_access_policies() -> (Vec<AccessPolicy>, Vec<AccessPolicy>) {
     // policies is always "Department::FIN && Security Level::Protected" only.
     #[allow(unused_mut)]
     let mut user_access_policies =
-        vec![
-            AccessPolicy::from_boolean_expression("Department::FIN && Security Level::Protected")
-                .unwrap(),
-        ];
+        vec![AccessPolicy::parse("Department::FIN && Security Level::Protected").unwrap()];
 
     #[cfg(feature = "full_bench")]
     {
         user_access_policies.push(
-            AccessPolicy::from_boolean_expression(
+            AccessPolicy::parse(
                 "(Department::FIN && Department::MKG) && Security Level::Protected",
             )
             .unwrap(),
         );
         user_access_policies.push(
-            AccessPolicy::from_boolean_expression(
+            AccessPolicy::parse(
                 "(Department::FIN && Department::MKG && Department::HR) && Security \
                  Level::Protected",
             )
             .unwrap(),
         );
         user_access_policies.push(
-            AccessPolicy::from_boolean_expression(
-                "(Department::R&D && Department::FIN && Department::MKG && Department::HR) && \
+            AccessPolicy::parse(
+                "(Department::RD && Department::FIN && Department::MKG && Department::HR) && \
                  Security Level::Protected",
             )
             .unwrap(),
         );
         user_access_policies.push(
-            AccessPolicy::from_boolean_expression(
-                "(Department::R&D && Department::FIN && Department::MKG && Department::HR && \
+            AccessPolicy::parse(
+                "(Department::RD && Department::FIN && Department::MKG && Department::HR && \
                  Department::CYBER) && Security Level::Protected",
             )
             .unwrap(),

examples/runme.rs

@@ -47,8 +47,7 @@ fn main() {
     // The user has a security clearance `Security Level::Top Secret`,
     // and belongs to the finance department (`Department::FIN`).
     let access_policy =
-        AccessPolicy::from_boolean_expression("Security Level::Top Secret && Department::FIN")
-            .unwrap();
+        AccessPolicy::parse("Security Level::Top Secret && Department::FIN").unwrap();
     let mut usk = cover_crypt
         .generate_user_secret_key(&msk, &access_policy, &policy)
         .unwrap();