change acl to access_control for clarity

Author: kauncoder

DEFAULT_CONFIG.json5

@@ -175,8 +175,8 @@
   //      ],
   //    },
   //  ],
-  //  /// configure acl rules 
-  //  acl: {
+  //  /// configure access control (ACL) rules 
+  //  access_control: {
   //   ///[true/false] acl will be activated only if this is set to true
   //   "enabled": false,
   //   ///[deny/allow] default permission is deny (even if this is left empty or not specified)
@@ -186,12 +186,12 @@
   //   [
   //     {
   //       "actions": [
-  //         "put"
+  //         put, get, declare_subscriber, declare_queryable
   //       ],
   //       "flows":["egress","ingress"],
   //       "permission": "allow",
   //       "key_exprs": [
-  //         "test/thr"
+  //         "test/demo"
   //       ],
   //       "interfaces": [
   //         "lo0"

commons/zenoh-config/src/lib.rs

@@ -497,7 +497,9 @@ validated_struct::validator! {
 
         /// Configuration of the downsampling.
         downsampling: Vec<DownsamplingItemConf>,
-        pub acl: AclConfig {
+
+        ///Configuration of the access control (ACL)
+        pub access_control: AclConfig {
             pub enabled: bool,
             pub default_permission: Permission,
             pub rules: Option<Vec<AclConfigRules>>

zenoh/src/net/routing/interceptor/mod.rs

@@ -64,7 +64,7 @@ pub(crate) fn interceptor_factories(config: &Config) -> ZResult<Vec<InterceptorF
     // Uncomment to log the interceptors initialisation
     // res.push(Box::new(LoggerInterceptor {}));
     res.extend(downsampling_interceptor_factories(config.downsampling())?);
-    res.extend(acl_interceptor_factories(config.acl())?);
+    res.extend(acl_interceptor_factories(config.access_control())?);
     Ok(res)
 }
 

zenoh/tests/acl.rs

@@ -10,7 +10,6 @@ const KEY_EXPR: &str = "test/demo";
 const VALUE: &str = "zenoh";
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
-#[cfg(not(target_os = "windows"))]
 async fn test_acl() {
     zenoh_util::init_log_from_env();
     test_pub_sub_deny().await;
@@ -56,7 +55,7 @@ async fn test_pub_sub_deny() {
     let mut config_router = get_basic_router_config().await;
     config_router
         .insert_json5(
-            "acl",
+            "access_control",
             r#"{
                 "enabled": true,
                 "default_permission": "deny",
@@ -104,7 +103,7 @@ async fn test_pub_sub_allow() {
     let mut config_router = get_basic_router_config().await;
     config_router
         .insert_json5(
-            "acl",
+            "access_control",
             r#"{
             
               "enabled": false,
@@ -152,7 +151,7 @@ async fn test_pub_sub_allow_then_deny() {
     let mut config_router = get_basic_router_config().await;
     config_router
         .insert_json5(
-            "acl",
+            "access_control",
             r#"
         {"enabled": true,
           "default_permission": "allow",
@@ -212,7 +211,7 @@ async fn test_pub_sub_deny_then_allow() {
     let mut config_router = get_basic_router_config().await;
     config_router
         .insert_json5(
-            "acl",
+            "access_control",
             r#"
         {"enabled": true,
           "default_permission": "deny",
@@ -272,7 +271,7 @@ async fn test_get_qbl_deny() {
     let mut config_router = get_basic_router_config().await;
     config_router
         .insert_json5(
-            "acl",
+            "access_control",
             r#"{
                 "enabled": true,
                 "default_permission": "deny",
@@ -328,7 +327,7 @@ async fn test_get_qbl_allow() {
     let mut config_router = get_basic_router_config().await;
     config_router
         .insert_json5(
-            "acl",
+            "access_control",
             r#"{
                 "enabled": true,
                 "default_permission": "allow",
@@ -384,7 +383,7 @@ async fn test_get_qbl_deny_then_allow() {
     let mut config_router = get_basic_router_config().await;
     config_router
         .insert_json5(
-            "acl",
+            "access_control",
             r#"
         {"enabled": true,
           "default_permission": "deny",
@@ -455,7 +454,7 @@ async fn test_get_qbl_allow_then_deny() {
     let mut config_router = get_basic_router_config().await;
     config_router
         .insert_json5(
-            "acl",
+            "access_control",
             r#"
         {"enabled": true,
           "default_permission": "allow",