feat: support AddNamedPoliciesEx API (#417)

casbin · Sep 7, 2024 · 1d89844 · 1d89844
1 parent 4abeb4a
commit 1d89844
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 4 deletions.
diff --git a/src/main/java/org/casbin/jcasbin/main/InternalEnforcer.java b/src/main/java/org/casbin/jcasbin/main/InternalEnforcer.java
@@ -104,7 +104,15 @@ boolean addPolicy(String sec, String ptype, List<String> rule) {
     /**
      * addPolicies adds rules to the current policy.
      */
-    boolean addPolicies(String sec, String ptype, List<List<String>> rules) {
+    boolean addPolicies(String sec, String ptype, List<List<String>> rules, boolean autoRemoveRepeat) {
+        if(autoRemoveRepeat) {
+            for (List<String> rule : rules) {
+                if(model.hasPolicy(sec, ptype, rule)) {
+                    model.removePolicy(sec, ptype, rule);
+                }
+            }
+        }
+
         if (mustUseDispatcher()) {
             dispatcher.addPolicies(sec, ptype, rules);
             return true;

diff --git a/src/main/java/org/casbin/jcasbin/main/ManagementEnforcer.java b/src/main/java/org/casbin/jcasbin/main/ManagementEnforcer.java
@@ -337,7 +337,20 @@ public boolean addNamedPolicy(String ptype, List<String> params) {
      * @return succeeds or not.
      */
     public boolean addNamedPolicies(String ptype, List<List<String>> rules) {
-        return addPolicies("p", ptype, rules);
+        return addPolicies("p", ptype, rules, false);
+    }
+
+    /**
+     * addNamedPoliciesEx adds authorization rules to the current named policy.
+     * If the rule already exists, the rule will not be added.
+     * But unlike AddNamedPolicies, other non-existent rules are added instead of returning false directly
+     *
+     * @param ptype the policy type, can be "p", "p2", "p3", ..
+     * @param rules the "p" policy rules.
+     * @return succeeds or not.
+     */
+    public boolean addNamedPoliciesEx(String ptype, List<List<String>> rules) {
+        return addPolicies("p", ptype, rules, true);
     }
 
     /**
@@ -616,7 +629,7 @@ public boolean addNamedGroupingPolicy(String ptype, String... params) {
      * @return succeeds or not.
      */
     public boolean addNamedGroupingPolicies(String ptype, List<List<String>> rules) {
-        return addPolicies("g", ptype, rules);
+        return addPolicies("g", ptype, rules, false);
     }
 
     /**

diff --git a/src/main/java/org/casbin/jcasbin/main/SyncedEnforcer.java b/src/main/java/org/casbin/jcasbin/main/SyncedEnforcer.java
@@ -614,6 +614,20 @@ public boolean addNamedPolicies(String ptype, List<List<String>> rules) {
         return runSynchronized(() -> super.addNamedPolicies(ptype, rules), READ_WRITE_LOCK.writeLock());
     }
 
+    /**
+     * addNamedPoliciesEx adds authorization rules to the current named policy.
+     * If the rule already exists, the rule will not be added.
+     * But unlike AddNamedPolicies, other non-existent rules are added instead of returning false directly
+     *
+     * @param ptype the policy type, can be "p", "p2", "p3", ..
+     * @param rules the "p" policy rules.
+     * @return succeeds or not.
+     */
+    @Override
+    public boolean addNamedPoliciesEx(String ptype, List<List<String>> rules) {
+        return runSynchronized(() -> super.addNamedPoliciesEx(ptype, rules), READ_WRITE_LOCK.writeLock());
+    }
+
     /**
      * updateNamedPolicy updates an authorization rule to the current named policy.
      *

diff --git a/src/test/java/org/casbin/jcasbin/main/InternalEnforcerWithDispatcherTest.java b/src/test/java/org/casbin/jcasbin/main/InternalEnforcerWithDispatcherTest.java
@@ -43,7 +43,7 @@ public void testAddPolicy() {
 
     @Test
     public void testAddPolicies() {
-        boolean result = enforcer.addPolicies(SEC, PTYPE, singletonList(RULE));
+        boolean result = enforcer.addPolicies(SEC, PTYPE, singletonList(RULE), false);
         assertTrue(result);
     }
 

diff --git a/src/test/java/org/casbin/jcasbin/main/ManagementAPIUnitTest.java b/src/test/java/org/casbin/jcasbin/main/ManagementAPIUnitTest.java
@@ -126,6 +126,15 @@ public void testModifyPolicyAPI() {
 
         e.updateNamedPolicy("p", asList("eve", "data2", "read"), asList("eve", "data4", "read"));
         testGetPolicy(e, asList(asList("eve", "data4", "read")));
+
+        e.addNamedPolicies("p", asList(asList("eve", "data4", "read"), asList("user1", "data1", "read")));
+        testGetPolicy(e, asList(asList("eve", "data4", "read")));
+
+        e.addNamedPoliciesEx("p", asList(asList("eve", "data4", "read"), asList("user1", "data1", "read")));
+        testGetPolicy(e, asList(asList("eve", "data4", "read"), asList("user1", "data1", "read")));
+
+
+
     }
 
     @Test

diff --git a/src/test/java/org/casbin/jcasbin/main/SyncedManagementAPIUnitTest.java b/src/test/java/org/casbin/jcasbin/main/SyncedManagementAPIUnitTest.java
@@ -91,6 +91,12 @@ public void testModifyPolicyAPI() {
         e.removeFilteredPolicy(1, "data2");
 
         testGetPolicy(e, asList(asList("eve", "data3", "read")));
+
+        e.addNamedPolicies("p", asList(asList("eve", "data3", "read"), asList("user1", "data1", "read")));
+        testGetPolicy(e, asList(asList("eve", "data3", "read")));
+
+        e.addNamedPoliciesEx("p", asList(asList("eve", "data3", "read"), asList("user1", "data1", "read")));
+        testGetPolicy(e, asList(asList("eve", "data3", "read"), asList("user1", "data1", "read")));
     }
 
     @Test