[BUGFIX]group2group support sub_group_id array => TSG-18025v4.1.23

6 files changed, 104 insertions, 59 deletions

diff --git a/src/inc_internal/maat_limits.h b/src/inc_internal/maat_limits.h
index b9119df..2a6086e 100644
--- a/src/inc_internal/maat_limits.h
+++ b/src/inc_internal/maat_limits.h
@@ -23,6 +23,7 @@ extern "C"
 #define MAX_IP_STR_LEN        64
 #define MAX_INSTANCE_NAME_LEN 15
 #define MAX_GROUP_IDS_STR_LEN 256
+#define MAX_GROUP_CNT         128
 
 #ifdef __cplusplus
 }
diff --git a/src/inc_internal/maat_utils.h b/src/inc_internal/maat_utils.h
index 0204b66..3b4c762 100644
--- a/src/inc_internal/maat_utils.h
+++ b/src/inc_internal/maat_utils.h
@@ -20,6 +20,8 @@ extern "C"
 #include <stddef.h>
 #include <arpa/inet.h>
 
+#include "uthash/utarray.h"
+
 #define	TRUE	1
 #define	FALSE	0
 
@@ -122,6 +124,8 @@ int system_cmd_gzip(const char *src_file, const char *dst_file);
 
 int system_cmd_encrypt(const char *src_file, const char *dst_file, const char *password);
 
+int ids_str2longlong_array(const char *ids_str, UT_array *ids_array);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/json2iris.c b/src/json2iris.c
index 0672b47..46a0c6d 100644
--- a/src/json2iris.c
+++ b/src/json2iris.c
@@ -701,7 +701,7 @@ static int write_group2compile_line(int *group_ids, size_t n_group_id,
 	return 0;
 }
 
-static int write_group2group_line(int group_id, int super_group_id, int is_exclude,
+static int write_group2group_line(int sub_group_id, int super_group_id, int is_exclude,
                            		  struct iris_description *p_iris)
 {
 	char buff[4096] = {0};
@@ -710,8 +710,9 @@ static int write_group2group_line(int group_id, int super_group_id, int is_exclu
         return -1;
     }
 
-	snprintf(buff, sizeof(buff), "%d\t%d\t%d\t1\n", group_id, 
-            super_group_id, is_exclude);
+	snprintf(buff, sizeof(buff), "%d\t%d\t%d\t1\n", sub_group_id, 
+             super_group_id, is_exclude);
+	
 	table->write_pos += memcat(&(table->buff), table->write_pos, 
                                &(table->buff_sz), buff, strlen(buff));
 	table->line_count++;
diff --git a/src/maat_compile.c b/src/maat_compile.c
index 6acfcf7..03bde13 100644
--- a/src/maat_compile.c
+++ b/src/maat_compile.c
@@ -28,8 +28,6 @@
 
 #define MODULE_COMPILE	 module_name_str("maat.compile")
 
-#define MAX_GROUP_CNT        128
-#define MAX_SUPER_GROUP_CNT  128
 #define MAX_NOT_CLAUSE_NUM   8
 
 enum clause_not_flag {
@@ -666,33 +664,6 @@ static int is_valid_table_name(const char *str)
 	return 1;
 }
 
-static int group_ids_str2longlong(const char *group_ids_str, UT_array *group_ids)
-{
-    int counter = 0;
-    char *str = NULL;
-    char *saveptr = NULL;
-    char *subtoken = NULL;
-    const char *seps = ",";
-    char *dup_line = maat_strdup(group_ids_str);
-
-    for (str = dup_line; ; str = NULL) {
-        subtoken = strtok_r(str, seps, &saveptr);
-        if (subtoken == NULL)
-            break;
-        long long group_id = atoll(subtoken);
-        utarray_push_back(group_ids, &group_id); 
-        counter++;
-    }
-
-    FREE(dup_line);
-
-    if (0 == counter) {
-        return -1;
-    }
-
-    return 0;
-}
-
 static void group2compile_item_free(struct group2compile_item *g2c_item)
 {
     if (NULL == g2c_item) {
@@ -729,7 +700,7 @@ group2compile_item_new(const char *line, struct group2compile_schema *g2c_schema
     char group_ids_str[MAX_GROUP_IDS_STR_LEN] = {0};
     memcpy(group_ids_str, line + column_offset, MIN(MAX_GROUP_IDS_STR_LEN, column_len));
 
-    ret = group_ids_str2longlong(group_ids_str, g2c_item->group_ids);
+    ret = ids_str2longlong_array(group_ids_str, g2c_item->group_ids);
     if (ret < 0) {
         log_fatal(logger, MODULE_COMPILE,
 				  "[%s:%d] g2c table:<%s> group_ids str2longlong failed in line:%s",
diff --git a/src/maat_group.c b/src/maat_group.c
index 4602421..27b277c 100644
--- a/src/maat_group.c
+++ b/src/maat_group.c
@@ -14,6 +14,7 @@
 #include "log/log.h"
 #include "maat_group.h"
 #include "maat_utils.h"
+#include "maat_limits.h"
 #include "uthash/uthash.h"
 #include "uthash/utarray.h"
 #include "igraph/igraph.h"
@@ -22,7 +23,7 @@
 #define MODULE_GROUP	 module_name_str("maat.group")
 
 struct group2group_item {
-    long long group_id;
+    UT_array *sub_group_ids;
     long long super_group_id;
     int is_exclude;
 };
@@ -325,6 +326,7 @@ group2group_item_new(const char *line, struct group2group_schema *g2g_schema,
     size_t column_offset = 0;
     size_t column_len = 0;
     struct group2group_item *g2g_item = ALLOC(struct group2group_item, 1);
+    utarray_new(g2g_item->sub_group_ids, &ut_group_id_icd);
 
     int ret = get_column_pos(line, g2g_schema->group_id_column,
                              &column_offset, &column_len);
@@ -334,7 +336,24 @@ group2group_item_new(const char *line, struct group2group_schema *g2g_schema,
                   __FUNCTION__, __LINE__, table_name, line);
         goto error;
     }
-    g2g_item->group_id = atoll(line + column_offset);
+
+    char group_ids_str[MAX_GROUP_IDS_STR_LEN] = {0};
+    memcpy(group_ids_str, line + column_offset, MIN(MAX_GROUP_IDS_STR_LEN, column_len));
+
+    ret = ids_str2longlong_array(group_ids_str, g2g_item->sub_group_ids);
+    if (ret < 0) {
+        log_fatal(logger, MODULE_GROUP,
+				  "[%s:%d] g2c table:<%s> sub_group_ids str2longlong failed in line:%s",
+				  __FUNCTION__, __LINE__, table_name, line);
+		goto error; 
+    }
+
+    if (utarray_len(g2g_item->sub_group_ids) > MAX_GROUP_CNT) {
+        log_fatal(logger, MODULE_GROUP,
+				  "[%s:%d] g2c table:<%s> sub_group_ids exceed maximum:%d in line:%s",
+				  __FUNCTION__, __LINE__, table_name, MAX_GROUP_CNT, line);
+		goto error;
+    }
 
     ret = get_column_pos(line, g2g_schema->super_group_id_column, 
                          &column_offset, &column_len);
@@ -378,6 +397,15 @@ error:
 
 static void group2group_item_free(struct group2group_item *g2g_item)
 {
+    if (NULL == g2g_item) {
+        return;
+    }
+
+    if (g2g_item->sub_group_ids != NULL) {
+        utarray_free(g2g_item->sub_group_ids);
+        g2g_item->sub_group_ids = NULL;
+    }
+
     FREE(g2g_item);
 }
 
@@ -575,10 +603,10 @@ static int group_topology_add_group_to_group(struct maat_group_topology *group_t
     if (NULL == group_topo) {
         return -1;
     }
-	
+
     struct maat_group *group = group_topology_find_group(group_topo, group_id);
-	if (NULL == group) {
-		group = group_topology_add_group(group_topo, group_id);
+    if (NULL == group) {
+        group = group_topology_add_group(group_topo, group_id);
 	}
 	
     struct maat_group *super_group = group_topology_find_group(group_topo, super_group_id);
@@ -607,6 +635,15 @@ static int group_topology_add_group_to_group(struct maat_group_topology *group_t
 		ret = 0;
 	}
 
+    igraph_bool_t is_dag;
+	igraph_is_dag(&(group_topo->group_graph), &is_dag);
+	if (!is_dag) {
+		log_fatal(group_topo->logger, MODULE_GROUP,
+                  "[%s:%d] Sub group cycle detected, sub_group_id:%lld, super_group_id:%lld!",
+                  __FUNCTION__, __LINE__, group_id, super_group_id);
+		return -1;
+	}
+
 	return ret;
 }
 
@@ -704,7 +741,6 @@ int group2group_runtime_update(void *g2g_runtime, void *g2g_schema,
         return -1;
     }
 
-	int ret = -1;
     struct group2group_schema *schema = (struct group2group_schema *)g2g_schema;
 	struct group2group_runtime *g2g_rt = (struct group2group_runtime *)g2g_runtime;
     int is_valid = get_column_value(line, valid_column);
@@ -730,33 +766,38 @@ int group2group_runtime_update(void *g2g_runtime, void *g2g_schema,
         g2g_rt->updating_flag = 1;
     }
 
+    int ret = 0;
+    size_t i = 0;
+    long long *tmp_group_id = NULL;
     if (0 == is_valid) {
         //delete
-        ret = group_topology_del_group_from_group(g2g_rt->updating_group_topo,
-                                                  g2g_item->group_id, 
-                                                  g2g_item->super_group_id,
-                                                  g2g_item->is_exclude);
-        if (0 == ret) {
-            g2g_rt->rule_num--;
-            if (1 == g2g_item->is_exclude) {
-                g2g_rt->excl_rule_num--;
+        for (i = 0; i < utarray_len(g2g_item->sub_group_ids); i++) {
+            tmp_group_id = (long long *)utarray_eltptr(g2g_item->sub_group_ids, i);
+            ret = group_topology_del_group_from_group(g2g_rt->updating_group_topo, *tmp_group_id,
+                                                      g2g_item->super_group_id, g2g_item->is_exclude);
+            if (0 == ret) {
+                g2g_rt->rule_num--;
+                if (1 == g2g_item->is_exclude) {
+                    g2g_rt->excl_rule_num--;
+                }
+            } else {
+                g2g_rt->update_err_cnt++;
             }
-        } else {
-            g2g_rt->update_err_cnt++;
         }
     } else {
         //add
-        ret = group_topology_add_group_to_group(g2g_rt->updating_group_topo,
-                                                g2g_item->group_id,
-                                                g2g_item->super_group_id,
-                                                g2g_item->is_exclude);
-        if (0 == ret) {
-            g2g_rt->rule_num++;
-            if (1 == g2g_item->is_exclude) {
-                g2g_rt->excl_rule_num++;
+        for (i = 0; i < utarray_len(g2g_item->sub_group_ids); i++) {
+            tmp_group_id = (long long *)utarray_eltptr(g2g_item->sub_group_ids, i);
+            ret = group_topology_add_group_to_group(g2g_rt->updating_group_topo, *tmp_group_id,
+                                                    g2g_item->super_group_id, g2g_item->is_exclude);
+            if (0 == ret) {
+                g2g_rt->rule_num++;
+                if (1 == g2g_item->is_exclude) {
+                    g2g_rt->excl_rule_num++;
+                }
+            } else {
+                g2g_rt->update_err_cnt++;
             }
-        } else {
-            g2g_rt->update_err_cnt++;
         }
     }
     group2group_item_free(g2g_item);
diff --git a/src/maat_utils.c b/src/maat_utils.c
index 6e1c84a..9165dc2 100644
--- a/src/maat_utils.c
+++ b/src/maat_utils.c
@@ -593,4 +593,31 @@ int ip_format2range(int ip_type, enum ip_format format, const char *ip1, const c
 		}
 	}
 	return 0;
+}
+
+int ids_str2longlong_array(const char *ids_str, UT_array *ids_array)
+{
+    int counter = 0;
+    char *str = NULL;
+    char *saveptr = NULL;
+    char *subtoken = NULL;
+    const char *seps = ",";
+    char *dup_line = maat_strdup(ids_str);
+
+    for (str = dup_line; ; str = NULL) {
+        subtoken = strtok_r(str, seps, &saveptr);
+        if (subtoken == NULL)
+            break;
+        long long group_id = atoll(subtoken);
+        utarray_push_back(ids_array, &group_id); 
+        counter++;
+    }
+
+    FREE(dup_line);
+
+    if (0 == counter) {
+        return -1;
+    }
+
+    return 0;
 }
\ No newline at end of file