feat: add add_grouping_policies_ex and add_named_grouping_policies_ex APIs (#392)

Author: Chimou0

casbin/management_enforcer.py

@@ -240,6 +240,14 @@ def add_grouping_policies(self, rules):
         """
         return self.add_named_grouping_policies("g", rules)
 
+    def add_grouping_policies_ex(self, rules):
+        """add_grouping_policies_ex adds role inheritance rules to the current policy.
+
+        If the rule already exists, the rule will not be added.
+        But unlike add_grouping_policies, other non-existent rules are added instead of returning false directly.
+        """
+        return self.add_named_grouping_policies_ex("g", rules)
+
     def add_named_grouping_policy(self, ptype, *params):
         """adds a named role inheritance rule to the current policy.
 
@@ -275,6 +283,18 @@ def add_named_grouping_policies(self, ptype, rules):
 
         return rules_added
 
+    def add_named_grouping_policies_ex(self, ptype, rules):
+        """add_named_grouping_policies_ex adds role inheritance rules to the current policy.
+
+        If the rule already exists, the rule will not be added.
+        But unlike add_named_grouping_policies, other non-existent rules are added instead of returning false directly.
+        """
+        rules_added = self._add_policies_ex("g", ptype, rules)
+        if rules_added and self.auto_build_role_links:
+            self.model.build_incremental_role_links(self.rm_map[ptype], PolicyOp.Policy_add, "g", ptype, rules)
+
+        return rules_added
+
     def remove_grouping_policy(self, *params):
         """removes a role inheritance rule from the current policy."""
         return self.remove_named_grouping_policy("g", *params)

casbin/persist/adapters/file_adapter.py

@@ -72,6 +72,9 @@ def add_policy(self, sec, ptype, rule):
     def add_policies(self, sec, ptype, rules):
         pass
 
+    def add_policies_ex(self, sec, ptype, rules):
+        pass
+
     def remove_policy(self, sec, ptype, rule):
         pass
 

casbin/synced_enforcer.py

@@ -645,6 +645,15 @@ def add_grouping_policies(self, rules):
         with self._wl:
             return self._e.add_grouping_policies(rules)
 
+    def add_grouping_policies_ex(self, rules):
+        """add_grouping_policies_ex adds role inheritance rules to the current policy.
+
+        If the rule already exists, the rule will not be added.
+        But unlike add_grouping_policies, other non-existent rules are added instead of returning false directly.
+        """
+        with self._wl:
+            return self._e.add_grouping_policies_ex(rules)
+
     def add_named_grouping_policies(self, ptype, rules):
         """ "adds named role inheritance rules to the current policy.
 
@@ -653,6 +662,15 @@ def add_named_grouping_policies(self, ptype, rules):
         with self._wl:
             return self._e.add_named_grouping_policies(ptype, rules)
 
+    def add_named_grouping_policies_ex(self, ptype, rules):
+        """add_named_grouping_policies_ex adds role inheritance rules to the current named policy.
+
+        If the rule already exists, the rule will not be added.
+        But unlike add_named_grouping_policies, other non-existent rules are added instead of returning false directly.
+        """
+        with self._wl:
+            return self._e.add_named_grouping_policies_ex(ptype, rules)
+
     def remove_grouping_policies(self, rules):
         """removes role inheritance rules from the current policy."""
         with self._wl:

tests/test_management_api.py

@@ -336,6 +336,29 @@ def test_modify_policy_api(self):
             [["user1", "data1", "read"], ["user2", "data2", "read"], ["user3", "data3", "read"]],
         )
 
+    def test_modify_grouping_policy_api(self):
+        e = self.get_enforcer(
+            get_examples("rbac_model.conf"),
+            get_examples("rbac_policy.csv"),
+            # True,
+        )
+        e.clear_policy()
+        e.add_grouping_policies_ex([["user1", "member"]])
+        self.assertCountEqual(
+            e.get_users_for_role("member"),
+            ["user1"],
+        )
+        e.add_grouping_policies_ex([["user1", "member"], ["user2", "member"]])
+        self.assertCountEqual(
+            e.get_users_for_role("member"),
+            ["user1", "user2"],
+        )
+        e.add_named_grouping_policies_ex("g", [["user1", "member"], ["user2", "member"], ["user3", "member"]])
+        self.assertCountEqual(
+            e.get_users_for_role("member"),
+            ["user1", "user2", "user3"],
+        )
+
 
 class TestManagementApiSynced(TestManagementApi):
     def get_enforcer(self, model=None, adapter=None):