hasRole return true if name equals, no matter func (casbin#274)

Author: JCereal

examples/rbac_with_pattern_regex_policy.csv

@@ -0,0 +1,6 @@
+p, employee, data1, read
+p, admin, data1, read
+p, admin, data1, write
+
+g, ^E\d+$, employee
+g, root, admin

src/main/java/org/casbin/jcasbin/rbac/DomainRoles.java

@@ -36,7 +36,7 @@ public boolean hasRole(final String name) {
 
     public boolean hasRole(final String name, BiPredicate<String, String> matchingFunc) {
         if (matchingFunc != null) {
-            return roles.keySet().stream().anyMatch(r -> matchingFunc.test(name, r));
+            return roles.keySet().stream().anyMatch(r -> matchingFunc.test(name, r) || r.equals(name));
         } else {
             return roles.containsKey(name);
         }

src/test/java/org/casbin/jcasbin/main/RbacAPIUnitTest.java

@@ -14,6 +14,9 @@
 
 package org.casbin.jcasbin.main;
 
+import org.casbin.jcasbin.persist.file_adapter.FileAdapter;
+import org.casbin.jcasbin.rbac.DefaultRoleManager;
+import org.casbin.jcasbin.util.BuiltInFunctions;
 import org.casbin.jcasbin.util.Util;
 import org.junit.Test;
 
@@ -87,6 +90,40 @@ public void testRoleAPI() {
         testEnforce(e, "bob", "data2", "write", true);
     }
 
+    @Test
+    public void testRoleAPIWithRegex() {
+        Enforcer e = new Enforcer("examples/rbac_model.conf");
+        e.setAdapter(new FileAdapter("examples/rbac_with_pattern_regex_policy.csv"));
+        e.setRoleManager("g", new DefaultRoleManager(10, BuiltInFunctions::regexMatch, null));
+        e.loadPolicy();
+
+        testGetRoles(e, "root", asList("admin"));
+        testGetRoles(e, "^E\\d+$", asList("employee"));
+        testGetRoles(e, "E101", asList("^E\\d+$"));
+        assertEquals(e.getImplicitRolesForUser("E101"), asList("^E\\d+$", "employee"));
+
+        testEnforce(e, "E101", "data1", "read", true);
+        testEnforce(e, "E101", "data1", "write", false);
+
+        e.addRoleForUser("^E\\d+$", "admin");
+
+        testGetRoles(e, "^E\\d+$", asList("employee","admin"));
+        testGetRoles(e, "E101", asList("^E\\d+$"));
+        assertEquals(e.getImplicitRolesForUser("E101"), asList("^E\\d+$", "employee", "admin"));
+
+        testEnforce(e, "E101", "data1", "read", true);
+        testEnforce(e, "E101", "data1", "write", true);
+
+        e.deleteRoleForUser("^E\\d+$", "admin");
+
+        testGetRoles(e, "^E\\d+$", asList("employee"));
+        testGetRoles(e, "E101", asList("^E\\d+$"));
+        assertEquals(e.getImplicitRolesForUser("E101"), asList("^E\\d+$", "employee"));
+
+        testEnforce(e, "E101", "data1", "read", true);
+        testEnforce(e, "E101", "data1", "write", false);
+    }
+
     @Test
     public void testGFunctionCache() {
         Enforcer e = new Enforcer("examples/rbac_model.conf", "examples/rbac_policy.csv");